Changeset 123977 in webkit

Timestamp:

Jul 28, 2012, 9:59:30 PM (13 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: RenderBlock::offsetForContents() is wrong in flipped blocks writing modes
​https://bugs.webkit.org/show_bug.cgi?id=92588

Reviewed by Sam Weinig.

Tests: fast/multicol/hit-test-block-axis-flipped.html

fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::offsetForContents): Flip the point, which puts it back in unflipped
coordinates, before adding the scroll offset and adjusting for columns, then flip it back.
(WebCore::RenderBlock::adjustPointToColumnContents): Changed the inline-axis cases to
work with an unflipped point.

LayoutTests: Hit test results are wrong in flipped blocks writing modes with block column axis
​https://bugs.webkit.org/show_bug.cgi?id=92588

Reviewed by Sam Weinig.

• fast/multicol/hit-test-block-axis-flipped-expected.txt: Added.
• fast/multicol/hit-test-block-axis-flipped.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/hit-test-block-axis-flipped-expected.txt (added)
• LayoutTests/fast/multicol/hit-test-block-axis-flipped.html (added)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll-expected.txt (added)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-28  Dan Bernstein  <mitz@apple.com>
+
+        Hit test results are wrong in flipped blocks writing modes with block column axis
+        https://bugs.webkit.org/show_bug.cgi?id=92588
+
+        Reviewed by Sam Weinig.
+
+        * fast/multicol/hit-test-block-axis-flipped-expected.txt: Added.
+        * fast/multicol/hit-test-block-axis-flipped.html: Added.
+
 2012-07-28  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-28  Dan Bernstein  <mitz@apple.com>
+
+        RenderBlock::offsetForContents() is wrong in flipped blocks writing modes
+        https://bugs.webkit.org/show_bug.cgi?id=92588
+
+        Reviewed by Sam Weinig.
+
+        Tests: fast/multicol/hit-test-block-axis-flipped.html
+               fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::offsetForContents): Flip the point, which puts it back in unflipped
+        coordinates, before adding the scroll offset and adjusting for columns, then flip it back.
+        (WebCore::RenderBlock::adjustPointToColumnContents): Changed the inline-axis cases to
+        work with an unflipped point.
+
 2012-07-28  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5043 +5043 @@
 void RenderBlock::offsetForContents(LayoutPoint& offset) const
 {
+    offset = flipForWritingMode(offset);
+
     if (hasOverflowClip())
         offset += scrolledContentOffset();
@@ -5048 +5050 @@
     if (hasColumns())
         adjustPointToColumnContents(offset);
+
+    offset = flipForWritingMode(offset);
 }
 
@@ -5283 +5287 @@
                 // We're inside the column.  Translate the x and y into our column coordinate space.
                 if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
-                    point.move(columnPoint.x() - colRect.x(), logicalOffset);
+                    point.move(columnPoint.x() - colRect.x(), (!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset));
                 else
                     point.move((!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.x() + borderLeft() + paddingLeft(), 0);
                 return;
             }
-            
+
             // Move to the next position.
             logicalOffset += colInfo->progressionAxis() == ColumnInfo::InlineAxis ? colRect.height() : colRect.width();
@@ -5315 +5319 @@
                 // We're inside the column.  Translate the x and y into our column coordinate space.
                 if (colInfo->progressionAxis() == ColumnInfo::InlineAxis)
-                    point.move(logicalOffset, columnPoint.y() - colRect.y());
+                    point.move((!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset), columnPoint.y() - colRect.y());
                 else
                     point.move(0, (!style()->isFlippedBlocksWritingMode() ? logicalOffset : -logicalOffset) - colRect.y() + borderTop() + paddingTop());
                 return;
             }
-            
+
             // Move to the next position.
             logicalOffset += colInfo->progressionAxis() == ColumnInfo::InlineAxis ? colRect.width() : colRect.height();