[WK2] REGRESSION(r150798): scrolling coordinator is not being enabled when WebPage...
authormarcelo.lira@openbossa.org <marcelo.lira@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jun 2013 22:06:39 +0000 (22:06 +0000)
committermarcelo.lira@openbossa.org <marcelo.lira@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jun 2013 22:06:39 +0000 (22:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117163

Reviewed by Darin Adler.

Moved call to WebPage::settings()->setScrollingCoordinatorEnabled()
from CoordinatedLayerTreeHost constructor to WebPage::setUseFixedLayout().
The scrolling coordinator must be enabled or disabled following the
WebPage's use of fixed layout.

* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setUseFixedLayout):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 37f92f9..ded87d9 100644 (file)
@@ -1,3 +1,20 @@
+2013-06-03  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [WK2] REGRESSION(r150798): scrolling coordinator is not being enabled when WebPage is set to use fixed layout
+        https://bugs.webkit.org/show_bug.cgi?id=117163
+
+        Reviewed by Darin Adler.
+
+        Moved call to WebPage::settings()->setScrollingCoordinatorEnabled()
+        from CoordinatedLayerTreeHost constructor to WebPage::setUseFixedLayout().
+        The scrolling coordinator must be enabled or disabled following the
+        WebPage's use of fixed layout.
+
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setUseFixedLayout):
+
 2013-06-03  Anders Carlsson  <andersca@apple.com>
 
         Send mouse events to the banner for as long as the mouse button is down
index 422ae5d..66b5016 100644 (file)
@@ -99,8 +99,6 @@ CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage* webPage)
     , m_lastAnimationServiceTime(0)
 #endif
 {
-    if (m_webPage->useFixedLayout())
-        m_webPage->corePage()->settings()->setScrollingCoordinatorEnabled(true);
     m_webPage->corePage()->settings()->setApplyDeviceScaleFactorInCompositor(true);
 
     // Create a root layer.
index f729cd1..02a6407 100644 (file)
@@ -1329,6 +1329,7 @@ void WebPage::setUseFixedLayout(bool fixed)
     m_page->settings()->setAcceleratedCompositingForFixedPositionEnabled(fixed);
     m_page->settings()->setFixedPositionCreatesStackingContext(fixed);
     m_page->settings()->setApplyPageScaleFactorInCompositor(fixed);
+    m_page->settings()->setScrollingCoordinatorEnabled(fixed);
 #endif
 
 #if USE(TILED_BACKING_STORE) && ENABLE(SMOOTH_SCROLLING)