Title: [124024] trunk/Source/WebCore
Revision
124024
Author
[email protected]
Date
2012-07-30 07:23:13 -0700 (Mon, 30 Jul 2012)

Log Message

Wheel events on a page with frames are not handled in fixed layout
https://bugs.webkit.org/show_bug.cgi?id=90550

Reviewed by Antonio Gomes.

Based on patch by Andras Becsi.

Frame-rect size is not the right value to check against to see if the document
can be contained within the full visible content rect, since it does not handle
fixedVisibleContentRect. Instead visibleContentRect(true) should be used which
returns the full visible content rect disregarding scrollbars, and which is
the same a frame-rect size when fixedVisibleContentRect is not set.

* platform/ScrollView.cpp:
(WebCore::ScrollView::updateScrollbars):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (124023 => 124024)


--- trunk/Source/WebCore/ChangeLog	2012-07-30 14:11:32 UTC (rev 124023)
+++ trunk/Source/WebCore/ChangeLog	2012-07-30 14:23:13 UTC (rev 124024)
@@ -1,5 +1,23 @@
 2012-07-30  Allan Sandfeld Jensen  <[email protected]>
 
+        Wheel events on a page with frames are not handled in fixed layout
+        https://bugs.webkit.org/show_bug.cgi?id=90550
+
+        Reviewed by Antonio Gomes.
+
+        Based on patch by Andras Becsi.
+
+        Frame-rect size is not the right value to check against to see if the document
+        can be contained within the full visible content rect, since it does not handle
+        fixedVisibleContentRect. Instead visibleContentRect(true) should be used which
+        returns the full visible content rect disregarding scrollbars, and which is
+        the same a frame-rect size when fixedVisibleContentRect is not set.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars):
+
+2012-07-30  Allan Sandfeld Jensen  <[email protected]>
+
         There is no way to tell whether an element can be activated or not
         https://bugs.webkit.org/show_bug.cgi?id=92093
 

Modified: trunk/Source/WebCore/platform/ScrollView.cpp (124023 => 124024)


--- trunk/Source/WebCore/platform/ScrollView.cpp	2012-07-30 14:11:32 UTC (rev 124023)
+++ trunk/Source/WebCore/platform/ScrollView.cpp	2012-07-30 14:23:13 UTC (rev 124024)
@@ -501,16 +501,16 @@
         bool sendContentResizedNotification = false;
         
         IntSize docSize = contentsSize();
-        IntSize frameSize = frameRect().size();
+        IntSize fullVisibleSize = visibleContentRect(true /*includeScrollbars*/).size();
 
         if (hScroll == ScrollbarAuto) {
             newHasHorizontalScrollbar = docSize.width() > visibleWidth();
-            if (newHasHorizontalScrollbar && !m_updateScrollbarsPass && docSize.width() <= frameSize.width() && docSize.height() <= frameSize.height())
+            if (newHasHorizontalScrollbar && !m_updateScrollbarsPass && docSize.width() <= fullVisibleSize.width() && docSize.height() <= fullVisibleSize.height())
                 newHasHorizontalScrollbar = false;
         }
         if (vScroll == ScrollbarAuto) {
             newHasVerticalScrollbar = docSize.height() > visibleHeight();
-            if (newHasVerticalScrollbar && !m_updateScrollbarsPass && docSize.width() <= frameSize.width() && docSize.height() <= frameSize.height())
+            if (newHasVerticalScrollbar && !m_updateScrollbarsPass && docSize.width() <= fullVisibleSize.width() && docSize.height() <= fullVisibleSize.height())
                 newHasVerticalScrollbar = false;
         }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to