Title: [125013] trunk/Source/WebKit2
- Revision
- 125013
- Author
- [email protected]
- Date
- 2012-08-08 02:50:54 -0700 (Wed, 08 Aug 2012)
Log Message
[Qt][WK2] Set the fixed layout setting before creating the page
https://bugs.webkit.org/show_bug.cgi?id=93374
Reviewed by Noam Rosenthal.
Any page setting should preferrable be set before creating the page
but fixed layout was set after the initialization of the web page.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
(QQuickWebViewFlickablePrivate::initialize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125012 => 125013)
--- trunk/Source/WebKit2/ChangeLog 2012-08-08 09:45:23 UTC (rev 125012)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-08 09:50:54 UTC (rev 125013)
@@ -1,3 +1,17 @@
+2012-08-08 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Set the fixed layout setting before creating the page
+ https://bugs.webkit.org/show_bug.cgi?id=93374
+
+ Reviewed by Noam Rosenthal.
+
+ Any page setting should preferrable be set before creating the page
+ but fixed layout was set after the initialization of the web page.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewPrivate::initialize):
+ (QQuickWebViewFlickablePrivate::initialize):
+
2012-08-08 Mario Sanchez Prada <[email protected]>
[WK2] Add new C API to generate MHTML data from the UI process
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (125012 => 125013)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-08-08 09:45:23 UTC (rev 125012)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-08-08 09:50:54 UTC (rev 125013)
@@ -295,6 +295,7 @@
context = contextRef ? QtWebContext::create(toImpl(contextRef)) : QtWebContext::defaultContext();
webPageProxy = context->createWebPage(&pageClient, pageGroup.get());
+ webPageProxy->setUseFixedLayout(s_flickableViewportEnabled);
#if ENABLE(FULLSCREEN_API)
webPageProxy->fullScreenManager()->setWebView(q_ptr);
#endif
@@ -841,7 +842,6 @@
void QQuickWebViewFlickablePrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
{
QQuickWebViewPrivate::initialize(contextRef, pageGroupRef);
- webPageProxy->setUseFixedLayout(true);
}
void QQuickWebViewFlickablePrivate::onComponentComplete()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
