Permalink
Browse files

[Qt] Make sure that we don't prematurely force the first layout durin…

…g loading.


https://bugs.webkit.org/show_bug.cgi?id=94106

Reviewed by Kenneth Rohde Christiansen.

This would have the nasty effect that the frame loader would report the first layout
before loadCommitted was reported. This would resume the rendering engine prematurely,
showing blank content and reporting an empty contents size.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setFixedLayoutSize):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent dab81db commit 8628d527663de1b6de5655cbbe1a5da5b893da62 @jturcotte jturcotte committed Aug 16, 2012
Showing with 17 additions and 1 deletion.
  1. +14 −0 Source/WebKit2/ChangeLog
  2. +3 −1 Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1,3 +1,17 @@
+2012-08-15 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
+
+ [Qt] Make sure that we don't prematurely force the first layout during loading.
+ https://bugs.webkit.org/show_bug.cgi?id=94106
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ This would have the nasty effect that the frame loader would report the first layout
+ before loadCommitted was reported. This would resume the rendering engine prematurely,
+ showing blank content and reporting an empty contents size.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setFixedLayoutSize):
+
2012-08-16 Marcelo Lira <marcelo.lira@openbossa.org>
[Qt] Input method hints are not being set.
@@ -1115,7 +1115,9 @@ void WebPage::setFixedLayoutSize(const IntSize& size)
return;
view->setFixedLayoutSize(size);
- view->forceLayout();
+ // Do not force it until the first layout, this would then become our first layout prematurely.
+ if (view->didFirstLayout())
+ view->forceLayout();
}
void WebPage::setPaginationMode(uint32_t mode)

0 comments on commit 8628d52

Please sign in to comment.