Title: [115395] trunk/Source/WebCore
Revision
115395
Author
[email protected]
Date
2012-04-26 18:38:05 -0700 (Thu, 26 Apr 2012)

Log Message

REGRESSION (r115163): Unable to scroll article body with trackpad on altdevblogaday.com blog post
https://bugs.webkit.org/show_bug.cgi?id=85024
<rdar://problem/11330758>

Reviewed by Sam Weinig.

Fix broken logic in canHaveScrollbars.

* page/scrolling/ScrollingTreeNode.h:
(WebCore::ScrollingTreeNode::canHaveScrollbars):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (115394 => 115395)


--- trunk/Source/WebCore/ChangeLog	2012-04-27 01:24:04 UTC (rev 115394)
+++ trunk/Source/WebCore/ChangeLog	2012-04-27 01:38:05 UTC (rev 115395)
@@ -1,3 +1,16 @@
+2012-04-26  Anders Carlsson  <[email protected]>
+
+        REGRESSION (r115163): Unable to scroll article body with trackpad on altdevblogaday.com blog post
+        https://bugs.webkit.org/show_bug.cgi?id=85024
+        <rdar://problem/11330758>
+
+        Reviewed by Sam Weinig.
+
+        Fix broken logic in canHaveScrollbars.
+
+        * page/scrolling/ScrollingTreeNode.h:
+        (WebCore::ScrollingTreeNode::canHaveScrollbars):
+
 2012-04-24  James Robinson  <[email protected]>
 
         [chromium] Use different CCDrawQuad types for textures vs IOSurfaces

Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (115394 => 115395)


--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h	2012-04-27 01:24:04 UTC (rev 115394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h	2012-04-27 01:38:05 UTC (rev 115395)
@@ -63,7 +63,7 @@
     bool hasEnabledHorizontalScrollbar() const { return m_hasEnabledHorizontalScrollbar; }
     bool hasEnabledVerticalScrollbar() const { return m_hasEnabledVerticalScrollbar; }
 
-    bool canHaveScrollbars() const { return m_horizontalScrollbarMode != ScrollbarAlwaysOff && m_verticalScrollbarMode != ScrollbarAlwaysOff; }
+    bool canHaveScrollbars() const { return m_horizontalScrollbarMode != ScrollbarAlwaysOff || m_verticalScrollbarMode != ScrollbarAlwaysOff; }
 
 private:
     ScrollingTree* m_scrollingTree;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to