Title: [125781] trunk/Source/WebKit2
- Revision
- 125781
- Author
- [email protected]
- Date
- 2012-08-16 08:30:28 -0700 (Thu, 16 Aug 2012)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125780 => 125781)
--- trunk/Source/WebKit2/ChangeLog 2012-08-16 15:23:25 UTC (rev 125780)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-16 15:30:28 UTC (rev 125781)
@@ -1,3 +1,17 @@
+2012-08-15 Jocelyn Turcotte <[email protected]>
+
+ [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 <[email protected]>
[Qt] Input method hints are not being set.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (125780 => 125781)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-16 15:23:25 UTC (rev 125780)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-08-16 15:30:28 UTC (rev 125781)
@@ -1115,7 +1115,9 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
