Changeset 98400 in webkit

Timestamp:

Oct 25, 2011, 3:45:48 PM (15 years ago)

Author:

mitz@apple.com

Message:

Caret can be positioned or repainted incorrectly in flipped-blocks multi-column blocks
​https://bugs.webkit.org/show_bug.cgi?id=70851

Reviewed by Dave Hyatt.

• manual-tests/caret-in-columns-flipped.html: Added.
• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::adjustForColumns): Removed flipped-blocks writing mode considerations
from this function, since not all callers were expecting it to account for flippedness. This makes
it similar to adjustRectForColumns() in not adjusting for flippedness.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::offsetFromContainer): In the columns case, account for flipped-blocks modes
by first mapping the point and the offset to non-flipped, non-columns space, then adjusting for
columns, then flipping.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/caret-in-columns-flipped.html (added)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-25  Dan Bernstein  <mitz@apple.com>
+
+        Caret can be positioned or repainted incorrectly in flipped-blocks multi-column blocks
+        https://bugs.webkit.org/show_bug.cgi?id=70851
+
+        Reviewed by Dave Hyatt.
+
+        * manual-tests/caret-in-columns-flipped.html: Added.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::adjustForColumns): Removed flipped-blocks writing mode considerations
+        from this function, since not all callers were expecting it to account for flippedness. This makes
+        it similar to adjustRectForColumns() in not adjusting for flippedness.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::offsetFromContainer): In the columns case, account for flipped-blocks modes
+        by first mapping the point and the offset to non-flipped, non-columns space, then adjusting for
+        columns, then flipping.
+
 2011-10-25  Michal Mocny  <mmocny@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4758 +4758 @@
             sliceRect = sliceRect.transposedRect();
         
-        // If we have a flipped blocks writing mode, then convert the column so that it's coming from the after edge (either top or left edge).
-        adjustStartEdgeForWritingModeIncludingColumns(sliceRect);
-        
-        LayoutUnit logicalOffset = style()->isFlippedBlocksWritingMode() ? (colCount - 1 - i) * colLogicalHeight : i * colLogicalHeight;
+        LayoutUnit logicalOffset = i * colLogicalHeight;
 
         // Now we're in the same coordinate space as the point.  See if it is inside the rectangle.

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1423 +1423 @@
 
     if (!isInline() || isReplaced()) {
-        if (style()->position() != AbsolutePosition && style()->position() != FixedPosition) {
-            if (o->hasColumns()) {
-                LayoutRect columnRect(frameRect());
-                toRenderBlock(o)->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
-                offset += LayoutSize(columnRect.location().x(), columnRect.location().y());
-                columnRect.moveBy(point);
-                o->adjustForColumns(offset, columnRect.location());
-            } else
-                offset += topLeftLocationOffset();
+        if (style()->position() != AbsolutePosition && style()->position() != FixedPosition && o->hasColumns()) {
+            RenderBlock* block = toRenderBlock(o);
+            LayoutRect columnRect(frameRect());
+            block->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
+            offset += toSize(columnRect.location());
+            IntPoint columnPoint = block->flipForWritingModeIncludingColumns(point + offset);
+            offset = toSize(block->flipForWritingModeIncludingColumns(LayoutPoint(offset)));
+            o->adjustForColumns(offset, columnPoint);
+            offset = block->flipForWritingMode(offset);
         } else
             offset += topLeftLocationOffset();