Title: [128477] trunk/Source/WebKit/blackberry
Revision
128477
Author
[email protected]
Date
2012-09-13 10:03:05 -0700 (Thu, 13 Sep 2012)

Log Message

[BlackBerry] Missing conditions in InRegionScrollerPrivate::canScrollRenderBox
https://bugs.webkit.org/show_bug.cgi?id=96660

Reviewed by Antonio Gomes.
Patch by Jacky Jiang <[email protected]>

PR: 207884
According to RenderBox::canBeScrolledAndHasScrollableArea(), we should
bail out early in InRegionScrollerPrivate::canScrollRenderBox() if the
RenderBox's scroll height equals the client height and the scroll width
equals the client width. Otherwise, we will miss the conditions.

* Api/InRegionScroller.cpp:
(BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (128476 => 128477)


--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp	2012-09-13 16:37:42 UTC (rev 128476)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp	2012-09-13 17:03:05 UTC (rev 128477)
@@ -375,6 +375,9 @@
     if (!box->hasOverflowClip())
         return false;
 
+    if (box->scrollHeight() == box->clientHeight() && box->scrollWidth() == box->clientWidth())
+        return false;
+
     if (box->scrollsOverflowX() && (box->scrollWidth() != box->clientWidth())
         || box->scrollsOverflowY() && (box->scrollHeight() != box->clientHeight()))
         return true;

Modified: trunk/Source/WebKit/blackberry/ChangeLog (128476 => 128477)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-09-13 16:37:42 UTC (rev 128476)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-09-13 17:03:05 UTC (rev 128477)
@@ -1,3 +1,19 @@
+2012-09-13  Jacky Jiang  <[email protected]>
+
+        [BlackBerry] Missing conditions in InRegionScrollerPrivate::canScrollRenderBox
+        https://bugs.webkit.org/show_bug.cgi?id=96660
+
+        Reviewed by Antonio Gomes.
+
+        PR: 207884
+        According to RenderBox::canBeScrolledAndHasScrollableArea(), we should
+        bail out early in InRegionScrollerPrivate::canScrollRenderBox() if the
+        RenderBox's scroll height equals the client height and the scroll width
+        equals the client width. Otherwise, we will miss the conditions.
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):
+
 2012-09-13  Jessica Cao  <[email protected]>
 
         [BlackBerry] Page Popup for Month is non-functional.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to