Changeset 166082 in webkit

Timestamp:

Mar 21, 2014, 11:56:04 AM (11 years ago)

Author:

Simon Fraser

Message:

unobscuredContentRect() should have the same signature on iOS and other platforms,
and should not recurse on iOS.
​https://bugs.webkit.org/show_bug.cgi?id=130604
<rdar://problem/16392587>

Reviewed by Tim Horton and Beth Dakin.

Having different signatures on different platforms is a recipe for
build breakage. Give the iOS unobscuredContentRect() an unused
VisibleContentRectIncludesScrollbars parameter.

Also avoid recursion via unobscuredContentRect() calling visibleContentRectInternal().

• WebCore.exp.in:
• platform/ScrollView.cpp:

(WebCore::ScrollView::unobscuredContentRect):
(WebCore::ScrollView::unobscuredContentRectInternal):
(WebCore::ScrollView::visibleContentRectInternal):

• platform/ScrollView.h:

(WebCore::ScrollView::unobscuredContentRectIncludingScrollbars):

• platform/ios/ScrollViewIOS.mm:

(WebCore::ScrollView::unobscuredContentRect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• platform/ScrollView.cpp (modified) (4 diffs)
• platform/ScrollView.h (modified) (2 diffs)
• platform/ios/ScrollViewIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-21  Simon Fraser  <simon.fraser@apple.com>
+
+        unobscuredContentRect() should have the same signature on iOS and other platforms,
+        and should not recurse on iOS.
+        https://bugs.webkit.org/show_bug.cgi?id=130604
+        <rdar://problem/16392587>
+
+        Reviewed by Tim Horton and Beth Dakin.
+
+        Having different signatures on different platforms is a recipe for
+        build breakage. Give the iOS unobscuredContentRect() an unused 
+        VisibleContentRectIncludesScrollbars parameter.
+        
+        Also avoid recursion via unobscuredContentRect() calling visibleContentRectInternal().
+
+        * WebCore.exp.in:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::unobscuredContentRect):
+        (WebCore::ScrollView::unobscuredContentRectInternal):
+        (WebCore::ScrollView::visibleContentRectInternal):
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::unobscuredContentRectIncludingScrollbars):
+        * platform/ios/ScrollViewIOS.mm:
+        (WebCore::ScrollView::unobscuredContentRect):
+
 2014-03-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -2634 +2634 @@
 __ZN7WebCore9TileCache20setLayerPoolCapacityEj
 __ZNK7WebCore10FloatPointcv7CGPointEv
-__ZNK7WebCore10ScrollView21unobscuredContentRectEv
+__ZNK7WebCore10ScrollView21unobscuredContentRectENS_14ScrollableArea36VisibleContentRectIncludesScrollbarsE
 __ZNK7WebCore14DocumentLoader16responseMIMETypeEv
 __ZNK7WebCore14FrameSelection17wordOffsetInRangeEPKNS_5RangeE

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -236 +236 @@
     delegatesScrollingDidChange();
 }
-    
+
 #if !PLATFORM(IOS)
 IntRect ScrollView::unobscuredContentRect(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
+{
+    return unobscuredContentRectInternal(scrollbarInclusion);
+}
+#endif
+
+IntRect ScrollView::unobscuredContentRectInternal(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
 {
     FloatSize visibleContentSize = unscaledUnobscuredVisibleContentSize(scrollbarInclusion);
@@ -244 +250 @@
     return IntRect(IntPoint(m_scrollOffset), expandedIntSize(visibleContentSize));
 }
-#endif
-    
+
 IntSize ScrollView::unscaledTotalVisibleContentSize(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
 {
@@ -295 +300 @@
     
     if (platformWidget())
-        return unobscuredContentRect();
+        return unobscuredContentRect(scrollbarInclusion);
 #else
     UNUSED_PARAM(visibleContentRectBehavior);
@@ -308 +313 @@
 #endif
 
-#if PLATFORM(IOS)
-    return unobscuredContentRect();
-#else
-    return unobscuredContentRect(scrollbarInclusion);
-#endif
+    return unobscuredContentRectInternal(scrollbarInclusion);
 }
 #endif

trunk/Source/WebCore/platform/ScrollView.h

@@ -172 +172 @@
     // contribute to painting but not to the scrollable area.
     // The unobscuredContentRect is the area that is not covered by UI elements.
+    IntRect unobscuredContentRect(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
 #if PLATFORM(IOS)
-    IntRect unobscuredContentRect() const;
-    IntRect unobscuredContentRectIncludingScrollbars() const { return unobscuredContentRect(); }
+    IntRect unobscuredContentRectIncludingScrollbars() const { return unobscuredContentRect(IncludeScrollbars); }
 #else
-    IntRect unobscuredContentRect(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
     IntRect unobscuredContentRectIncludingScrollbars() const { return visibleContentRectIncludingScrollbars(); }
 #endif
@@ -393 +392 @@
 private:
     virtual IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const override;
+    IntRect unobscuredContentRectInternal(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
 
     RefPtr<Scrollbar> m_horizontalScrollbar;

trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm

@@ -97 +97 @@
 }
 
-IntRect ScrollView::unobscuredContentRect() const
+IntRect ScrollView::unobscuredContentRect(VisibleContentRectIncludesScrollbars) const
 {
     if (WAKScrollView *view = static_cast<WAKScrollView *>(platformWidget())) {
@@ -110 +110 @@
         return m_unobscuredContentRect;
 
-    return visibleContentRectIncludingScrollbars();
+    return unobscuredContentRectInternal();
 }