Changeset 171207 in webkit

Timestamp:

Jul 17, 2014 4:49:21 PM (10 years ago)

Author:

Beth Dakin

Message:

Fixed position elements are misplaced when a WK1 view has contentInsets set
​https://bugs.webkit.org/show_bug.cgi?id=135031
-and corresponding-
<rdar://problem/17682335>

Reviewed by Tim Horton.

[NSScrollView documentVisibleRect] is not the rect that we are looking for when
this function is called. WebCore is interested in the rect that does not include
content that is within the inset region.

Implement contract() to avoid the awkwardness of calling expand() with negative
values.

• platform/graphics/IntSize.h:

(WebCore::IntSize::contract):

Use _insetBounds instead of documentVisibleRect, and when it’s necessary to use
the frame’s dimensions, extract the inset from that size.

• platform/mac/ScrollViewMac.mm:

(WebCore::ScrollView::platformVisibleContentRect):
(WebCore::ScrollView::platformVisibleContentSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/IntSize.h (modified) (1 diff)
• platform/mac/ScrollViewMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-17  Beth Dakin  <bdakin@apple.com>
+
+        Fixed position elements are misplaced when a WK1 view has contentInsets set
+        https://bugs.webkit.org/show_bug.cgi?id=135031
+        -and corresponding-
+        <rdar://problem/17682335>
+
+        Reviewed by Tim Horton.
+
+        [NSScrollView documentVisibleRect] is not the rect that we are looking for when 
+        this function is called. WebCore is interested in the rect that does not include 
+        content that is within the inset region.
+
+        Implement contract() to avoid the awkwardness of calling expand() with negative 
+        values.
+        * platform/graphics/IntSize.h:
+        (WebCore::IntSize::contract):
+
+        Use _insetBounds instead of documentVisibleRect, and when it’s necessary to use 
+        the frame’s dimensions, extract the inset from that size.
+        * platform/mac/ScrollViewMac.mm:
+        (WebCore::ScrollView::platformVisibleContentRect):
+        (WebCore::ScrollView::platformVisibleContentSize):
+
 2014-07-17  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/platform/graphics/IntSize.h

@@ -82 +82 @@
     }
 
+    void contract(int width, int height)
+    {
+        m_width -= width;
+        m_height -= height;
+    }
+
     void scale(float widthScale, float heightScale)
     {

trunk/Source/WebCore/platform/mac/ScrollViewMac.mm

@@ -35 +35 @@
 #import "WebCoreFrameView.h"
 
+@interface NSClipView (Details)
+- (NSRect)_insetBounds;
+@end
+
+@interface NSScrollView (Details)
+- (NSEdgeInsets)contentInsets;
+@end
+
 @interface NSWindow (WebWindowDetails)
 - (BOOL)_needsToResetDragMargins;
@@ -108 +116 @@
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    IntRect result = enclosingIntRect([scrollView() documentVisibleRect]);
-    if (includeScrollbars)
-        result.setSize(IntSize([scrollView() frame].size));
-    return result;
-    END_BLOCK_OBJC_EXCEPTIONS;
+
+    IntRect visibleContentRect;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+    visibleContentRect = enclosingIntRect([[scrollView() contentView] _insetBounds]);
+#else
+    visibleContentRect = enclosingIntRect([scrollView() documentVisibleRect]);
+#endif
+
+    if (includeScrollbars) {
+        IntSize frameSize([scrollView() frame].size);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+        frameSize.contract(scrollView().contentInsets.left + scrollView().contentInsets.right, scrollView().contentInsets.top + scrollView().contentInsets.bottom);
+#endif
+        visibleContentRect.setSize(frameSize);
+    }
+
+    return visibleContentRect;
+    END_BLOCK_OBJC_EXCEPTIONS;
+
     return IntRect();
 }
@@ -118 +140 @@
 IntSize ScrollView::platformVisibleContentSize(bool includeScrollbars) const
 {
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    if (includeScrollbars)
-        return IntSize([scrollView() frame].size);
-
-    return expandedIntSize(FloatSize([scrollView() documentVisibleRect].size));
-    END_BLOCK_OBJC_EXCEPTIONS;
-    return IntSize();
+    return platformVisibleContentRect(includeScrollbars).size();
 }