Changeset 19012 for trunk/WebCore/rendering/RenderBox.cpp

Timestamp:

01/21/07 12:29:41 (2 years 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.

Files:

• trunk/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

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;