Changeset 23938 in webkit

Timestamp:

Jul 2, 2007 4:54:22 PM (17 years ago)

Author:

aroben

Message:

Fix Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error

WebCore:

Fix Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error
​http://bugs.webkit.org/show_bug.cgi?id=14498

There were two bugs:
1) xPos/yPos were flipped
2) + binds tighter than ?:, so the order of operations was incorrect

Reviewed by Darin.

Test: fast/inline-block/14498-positionForCoordinates.html

• rendering/RenderContainer.cpp: (WebCore::RenderContainer::positionForCoordinates):

LayoutTests:

Test for Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error
​http://bugs.webkit.org/show_bug.cgi?id=14498

Reviewed by Darin.

• fast/inline-block/14498-positionForCoordinates-expected.txt: Added.
• fast/inline-block/14498-positionForCoordinates.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline-block/14498-positionForCoordinates-expected.txt (added)
• LayoutTests/fast/inline-block/14498-positionForCoordinates.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderContainer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-02  Adam Roben  <aroben@apple.com>
+
+        Test for Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error
+        http://bugs.webkit.org/show_bug.cgi?id=14498
+
+        Reviewed by Darin.
+
+        * fast/inline-block/14498-positionForCoordinates-expected.txt: Added.
+        * fast/inline-block/14498-positionForCoordinates.html: Added.
+
 2007-07-01  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-02  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 14498: RenderContainer::positionForCoordinates contains an order of operations error
+        http://bugs.webkit.org/show_bug.cgi?id=14498
+
+        There were two bugs:
+        1) xPos/yPos were flipped
+        2) + binds tighter than ?:, so the order of operations was incorrect
+
+        Reviewed by Darin.
+
+        Test: fast/inline-block/14498-positionForCoordinates.html
+
+        * rendering/RenderContainer.cpp:
+        (WebCore::RenderContainer::positionForCoordinates):
+
 2007-07-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderContainer.cpp

@@ -584 +584 @@
             continue;
         
-        int top = borderTop() + paddingTop() + isTableRow() ? 0 : renderer->xPos();
+        int top = borderTop() + paddingTop() + (isTableRow() ? 0 : renderer->yPos());
         int bottom = top + renderer->contentHeight();
-        int left = borderLeft() + paddingLeft() + isTableRow() ? 0 : renderer->yPos();
+        int left = borderLeft() + paddingLeft() + (isTableRow() ? 0 : renderer->xPos());
         int right = left + renderer->contentWidth();