Changeset 171224 in webkit

Timestamp:

Jul 18, 2014 10:14:38 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r171207.
​https://bugs.webkit.org/show_bug.cgi?id=135056

Broke multiple tests on Yosemite (Requested by ap on #webkit).

Reverted changeset:

"Fixed position elements are misplaced when a WK1 view has
contentInsets set"
​https://bugs.webkit.org/show_bug.cgi?id=135031
​http://trac.webkit.org/changeset/171207

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-18  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r171207.
+        https://bugs.webkit.org/show_bug.cgi?id=135056
+
+        Broke multiple tests on Yosemite (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Fixed position elements are misplaced when a WK1 view has
+        contentInsets set"
+        https://bugs.webkit.org/show_bug.cgi?id=135031
+        http://trac.webkit.org/changeset/171207
+
 2014-07-18  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -80 +80 @@
         m_width += width;
         m_height += height;
-    }
-
-    void contract(int width, int height)
-    {
-        m_width -= width;
-        m_height -= height;
     }
 

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;
@@ -116 +108 @@
 {
     BEGIN_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;
-
+    IntRect result = enclosingIntRect([scrollView() documentVisibleRect]);
+    if (includeScrollbars)
+        result.setSize(IntSize([scrollView() frame].size));
+    return result;
+    END_BLOCK_OBJC_EXCEPTIONS;
     return IntRect();
 }
@@ -140 +118 @@
 IntSize ScrollView::platformVisibleContentSize(bool includeScrollbars) const
 {
-    return platformVisibleContentRect(includeScrollbars).size();
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    if (includeScrollbars)
+        return IntSize([scrollView() frame].size);
+
+    return expandedIntSize(FloatSize([scrollView() documentVisibleRect].size));
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return IntSize();
 }