Unreviewed, rolling out r113611.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Apr 2012 19:48:06 +0000 (19:48 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Apr 2012 19:48:06 +0000 (19:48 +0000)
http://trac.webkit.org/changeset/113611
https://bugs.webkit.org/show_bug.cgi?id=71541

Broke fast/forms/basic-textareas.html

Source/WebCore:

* rendering/RenderBox.h:
(RenderBox):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::hasHorizontalOverflow):
(WebCore::RenderLayer::hasVerticalOverflow):

LayoutTests:

* fast/overflow/overflow-auto-destroy-scroll-after-resizing-expected.html: Removed.
* fast/overflow/overflow-auto-destroy-scroll-after-resizing.html: Removed.
* platform/efl/Skipped:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113756 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing-expected.html [deleted file]
LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing.html [deleted file]
LayoutTests/platform/efl/Skipped
LayoutTests/platform/mac/Skipped
LayoutTests/platform/qt/Skipped
LayoutTests/platform/win/Skipped
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderLayer.cpp

index c109f32..656327f 100644 (file)
@@ -1,3 +1,18 @@
+2012-04-10  Anders Carlsson  <andersca@apple.com>
+
+        Unreviewed, rolling out r113611.
+        http://trac.webkit.org/changeset/113611
+        https://bugs.webkit.org/show_bug.cgi?id=71541
+
+        Broke fast/forms/basic-textareas.html
+
+        * fast/overflow/overflow-auto-destroy-scroll-after-resizing-expected.html: Removed.
+        * fast/overflow/overflow-auto-destroy-scroll-after-resizing.html: Removed.
+        * platform/efl/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2012-04-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r113734.
diff --git a/LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing-expected.html b/LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing-expected.html
deleted file mode 100644 (file)
index bda5773..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-    </head>
-    <body>
-        <p> Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=71541">71541</a>: Unnecessary scroll bar after changing the dimensions of a DIV </p>
-        <p> For this test to pass, we should not see any scrollbars once width and height are changed to 100*100 through javascript </p>
-        <div id="divId" style="position:absolute; left:110px; top:140px; width:100px; height:100px; overflow:auto;">
-            <div style="position:absolute; left:0px; top:0px; width:100px; height:100px; background-color:Green">My Width and Height is 100 and 100</div>
-        </div>
-    </body>
-</html>
-
diff --git a/LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing.html b/LayoutTests/fast/overflow/overflow-auto-destroy-scroll-after-resizing.html
deleted file mode 100644 (file)
index 003b819..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script type="text/javascript">
-            function increaseOuterDiv() {
-                var outer = document.getElementById("divId");
-                outer.style.height = "100px";
-                outer.style.width = "100px";
-            }
-
-            window.addEventListener("load", increaseOuterDiv, false);
-        </script>
-    </head>
-    <body>
-        <p> Bug <a href="https://bugs.webkit.org/show_bug.cgi?id=71541">71541</a>: Unnecessary scroll bar after changing the dimensions of a DIV </p>
-        <p> For this test to pass, we should not see any scrollbars once width and height are changed to 100*100 through javascript </p>
-        <div id="divId" style="position:absolute; left:110px; top:140px; width:60px; height:60px; overflow:auto;">
-            <div style="position:absolute; left:0px; top:0px; width:100px; height:100px; background-color:Green">My Width and Height is 100 and 100</div>
-        </div>
-    </body>
-</html>
-
index e4b81cb..46573fe 100644 (file)
@@ -1892,10 +1892,6 @@ pointer-lock/
 # https://bugs.webkit.org/show_bug.cgi?id=64731
 http/tests/media/media-source/
 
-# Need rebaselining after https://bugs.webkit.org/show_bug.cgi?id=71541
-fast/overflow/hidden-scrollbar-resize.html
-scrollbars/scrollbars-on-positioned-content.html
-
 # Encrypted Media Extensions are not enabled.
 media/encrypted-media/
 fast/events/constructors/media-key-event-constructor.html
index a5b085f..e5627cd 100644 (file)
@@ -629,10 +629,6 @@ fast/inline/continuation-outlines-with-layers.html
 # Not possible to set UA string for media requests with all Mac media engines.
 http/tests/media/video-useragent.html
 
-# Need rebaselining after https://bugs.webkit.org/show_bug.cgi?id=71541
-fast/overflow/hidden-scrollbar-resize.html
-scrollbars/scrollbars-on-positioned-content.html
-
 # Rebaseline after https://bugs.webkit.org/show_bug.cgi?id=78412
 tables/mozilla/bugs/bug2123.html
 tables/mozilla/bugs/bug2509.html
index 22d837a..dc8efad 100644 (file)
@@ -2024,10 +2024,6 @@ tables/mozilla/bugs/bug27038-2.html
 # Needs a rebaseline, caused by https://bugs.webkit.org/show_bug.cgi?id=43022
 tables/mozilla_expected_failures/bugs/bug85016.html
 
-# Need rebaselining after https://bugs.webkit.org/show_bug.cgi?id=71541
-fast/overflow/hidden-scrollbar-resize.html
-scrollbars/scrollbars-on-positioned-content.html
-
 # The inner <input> should now grow to take the full cell's height.
 fast/table/colspanMinWidth-vertical.html
 # ============================================================================= #
index 3a44c95..feec0c6 100644 (file)
@@ -1677,10 +1677,6 @@ fast/dom/HTMLTableElement/colSpan.html
 fast/dom/HTMLTableElement/createCaption.html
 fast/repaint/table-section-repaint.html
 
-// Need rebaselining after https://bugs.webkit.org/show_bug.cgi?id=71541
-fast/overflow/hidden-scrollbar-resize.html
-scrollbars/scrollbars-on-positioned-content.html
-
 // Need rebaselining after bug 69210.
 fast/encoding/utf-16-big-endian.html
 fast/encoding/utf-16-little-endian.html
index c56d71b..1b914b3 100644 (file)
@@ -1,3 +1,17 @@
+2012-04-10  Anders Carlsson  <andersca@apple.com>
+
+        Unreviewed, rolling out r113611.
+        http://trac.webkit.org/changeset/113611
+        https://bugs.webkit.org/show_bug.cgi?id=71541
+
+        Broke fast/forms/basic-textareas.html
+
+        * rendering/RenderBox.h:
+        (RenderBox):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hasHorizontalOverflow):
+        (WebCore::RenderLayer::hasVerticalOverflow):
+
 2012-04-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r113734.
index 9e3904a..01b7389 100644 (file)
@@ -212,11 +212,6 @@ public:
     int pixelSnappedClientWidth() const;
     int pixelSnappedClientHeight() const;
 
-    LayoutUnit paddingBoxWidth() const { return width() - borderLeft() - borderRight(); }
-    LayoutUnit paddingBoxHeight() const { return height() - borderTop() - borderBottom(); }
-    int pixelSnappedPaddingBoxWidth() const { return snapSizeToPixel(paddingBoxWidth(), x() + paddingLeft()); }
-    int pixelSnappedPaddingBoxHeight() const { return snapSizeToPixel(paddingBoxHeight(), y() + paddingTop()); }
-
     // scrollWidth/scrollHeight will be the same as clientWidth/clientHeight unless the
     // object has overflow:hidden/scroll/auto specified and also has overflow.
     // scrollLeft/Top return the current scroll position.  These methods are virtual so that objects like
index f6894e6..250e090 100644 (file)
@@ -2417,15 +2417,15 @@ void RenderLayer::computeScrollDimensions()
 bool RenderLayer::hasHorizontalOverflow() const
 {
     ASSERT(!m_scrollDimensionsDirty);
-    int widthForHorizontalScrollbar = renderBox()->style()->overflowX() == OSCROLL ? renderBox()->pixelSnappedClientWidth() : renderBox()->pixelSnappedPaddingBoxWidth();
-    return scrollWidth() > widthForHorizontalScrollbar;
+
+    return scrollWidth() > renderBox()->pixelSnappedClientWidth();
 }
 
 bool RenderLayer::hasVerticalOverflow() const
 {
     ASSERT(!m_scrollDimensionsDirty);
-    int heightForVerticalScrollbar = renderBox()->style()->overflowY() == OSCROLL ? renderBox()->pixelSnappedClientHeight() : renderBox()->pixelSnappedPaddingBoxHeight();
-    return scrollHeight() > heightForVerticalScrollbar;
+
+    return scrollHeight() > renderBox()->pixelSnappedClientHeight();
 }
 
 void RenderLayer::updateScrollbarsAfterLayout()