Changeset 19012

Timestamp:

01/21/07 12:29:41 (23 months ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin.

• test for http://bugs.webkit.org/show_bug.cgi?id=10692 REGRESSION (r14847): Unnecessary scrollbars with position:relative; and overflow:auto;

• fast/overflow/position-relative-expected.checksum: Added.
• fast/overflow/position-relative-expected.png: Added.
• fast/overflow/position-relative-expected.txt: Added.
• fast/overflow/position-relative.html: Added.

WebCore:

Reviewed by Darin.

• fix http://bugs.webkit.org/show_bug.cgi?id=10692 REGRESSION (r14847): Unnecessary scrollbars with position:relative; and overflow:auto;

Test: fast/overflow/position-relative.html

• rendering/RenderBox.cpp: (WebCore::RenderBox::lowestPosition): Add the relative position offset only if 'includeSelf' is true. (WebCore::RenderBox::rightmostPosition): Ditto. (WebCore::RenderBox::leftmostPosition): Ditto.
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::lowestPosition): Ditto. (WebCore::RenderFlow::rightmostPosition): Ditto. (WebCore::RenderFlow::leftmostPosition): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/position-relative-expected.checksum (added)
• LayoutTests/fast/overflow/position-relative-expected.png (added)
• LayoutTests/fast/overflow/position-relative-expected.txt (added)
• LayoutTests/fast/overflow/position-relative.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (3 diffs)
• WebCore/rendering/RenderFlow.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-21  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=10692
+          REGRESSION (r14847): Unnecessary scrollbars with position:relative; and overflow:auto;
+
+        * fast/overflow/position-relative-expected.checksum: Added.
+        * fast/overflow/position-relative-expected.png: Added.
+        * fast/overflow/position-relative-expected.txt: Added.
+        * fast/overflow/position-relative.html: Added.
+
 2007-01-21  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-21  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=10692
+          REGRESSION (r14847): Unnecessary scrollbars with position:relative; and overflow:auto;
+
+        Test: fast/overflow/position-relative.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::lowestPosition): Add the relative position offset only
+        if 'includeSelf' is true.
+        (WebCore::RenderBox::rightmostPosition): Ditto.
+        (WebCore::RenderBox::leftmostPosition): Ditto.
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::lowestPosition): Ditto.
+        (WebCore::RenderFlow::rightmostPosition): Ditto.
+        (WebCore::RenderFlow::leftmostPosition): Ditto.
+
 2007-01-21  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -2411 +2411 @@
         return 0;
     int bottom = m_height;
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         bottom += relativePositionOffsetY();
     return bottom;
@@ -2421 +2421 @@
         return 0;
     int right = m_width;
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         right += relativePositionOffsetX();
     return right;
@@ -2431 +2431 @@
         return m_width;
     int left = 0;
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         left += relativePositionOffsetX();
     return left;

trunk/WebCore/rendering/RenderFlow.cpp

@@ -523 +523 @@
     }
 
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         bottom += relativePositionOffsetY();         
 
@@ -547 +547 @@
     }
 
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         right += relativePositionOffsetX();
 
@@ -571 +571 @@
     }
 
-    if (isRelPositioned())
+    if (includeSelf && isRelPositioned())
         left += relativePositionOffsetX();