[Qt] Enable FAST_MOBILE_SCROLLING when scrolling is delegated.

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

Patch by Allan Sandfeld Jensen <allan.jensen@nokia.com> on 2012-03-22
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

On the Qt platform only enable the fast mobile scroll feature when scrolling is delegated.

* rendering/RenderObject.cpp:
(WebCore::RenderObject::styleWillChange):

Tools:

Enable FAST_MOBILE_SCROLLING feature.

* qmake/mkspecs/features/features.prf:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ca101fd3840d3455fbbcb44c6329bc077d7e6e30..4118117eb31bd9b30d7c94116cd6c3442ad6f793 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-22  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt] Enable FAST_MOBILE_SCROLLING when scrolling is delegated.
+        https://bugs.webkit.org/show_bug.cgi?id=81889
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        On the Qt platform only enable the fast mobile scroll feature when scrolling is delegated.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::styleWillChange):
+
 2012-03-22  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: dispatch styleSheetChanged event synchronously.

diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
index 56b95be07418f5f53c37edccfab6c4145b779ec0..46afe30b7595bc5e0a2fbdfb621a08a202ef6891 100755 (executable)
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -1872,7 +1872,10 @@ void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS
         // when scrolling a page with a fixed background image. As an optimization, assuming there are
         // no fixed positoned elements on the page, we can acclerate scrolling (via blitting) if we
         // ignore the CSS property "background-attachment: fixed".
-        shouldBlitOnFixedBackgroundImage = true;
+#if PLATFORM(QT)
+        if (view()->frameView()->delegatesScrolling())
+#endif
+            shouldBlitOnFixedBackgroundImage = true;
 #endif
 
         bool newStyleSlowScroll = newStyle && !shouldBlitOnFixedBackgroundImage && newStyle->hasFixedBackgroundImage();

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 552ff63567a38bddd3278d911602dde39277dc9a..302613b3cb3da26aece8d567f8bef2d4c549e163 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-22  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt] Enable FAST_MOBILE_SCROLLING when scrolling is delegated.
+        https://bugs.webkit.org/show_bug.cgi?id=81889
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Enable FAST_MOBILE_SCROLLING feature.
+
+        * qmake/mkspecs/features/features.prf:
+
 2012-03-22  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
 
         [EFL] DRT: Do not pass a relative path to DOWNLOADED_FONTS_DIR.

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 06168c703367c357d9975a43d30a466a074ec0b0..09ece5e9aeca9be9f25b0dc5c1ae00df110bdf32 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -90,6 +90,7 @@ haveQt(5) {
 !contains(DEFINES, ENABLE_TOUCH_ICON_LOADING=.): DEFINES += ENABLE_TOUCH_ICON_LOADING=0
 !contains(DEFINES, ENABLE_ANIMATION_API=.): DEFINES += ENABLE_ANIMATION_API=0
 !contains(DEFINES, ENABLE_TOUCH_ADJUSTMENT=.): DEFINES += ENABLE_TOUCH_ADJUSTMENT=1
+!contains(DEFINES, ENABLE_FAST_MOBILE_SCROLLING=.): DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
 
 # Policy decisions: for using a particular third-party library or optional OS service
 !contains(DEFINES, WTF_USE_QT_IMAGE_DECODER=.): DEFINES += WTF_USE_QT_IMAGE_DECODER=1