Changeset 123146 in webkit

Timestamp:

Jul 19, 2012 1:46:03 PM (12 years ago)

Author:

mitz@apple.com

Message:

In flipped blocks writing modes, no flipping occurs when mapping RenderText’s local coordinates to absolute
​https://bugs.webkit.org/show_bug.cgi?id=91780

Reviewed by Anders Carlsson.

Source/WebCore:

Test: fast/writing-mode/flipped-blocks-text-map-local-to-container.html

When RenderObject::mapLocalToContainer() was called on a RenderText with ApplyContainerFlip,
it would not flip (if the container was not a box) but it would always pass
DoNotApplyContainerFlip when recurring to the parent. This meant that no one applied the flip.

• rendering/RenderInline.cpp:

(WebCore::RenderInline::mapLocalToContainer): Made the setting of applyContainerFlip to
false unconditional on the container actually being flipped.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::mapLocalToContainer): Rather than always passing
DoNotApplyContainerFlip when recurring to the parent, changed this function to pass through
the value of applyContainerFlip it was called with, unless it applied the flip itself.

LayoutTests:

• fast/writing-mode/flipped-blocks-text-map-local-to-container-expected.txt: Added.
• fast/writing-mode/flipped-blocks-text-map-local-to-container.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/flipped-blocks-text-map-local-to-container-expected.txt (added)
• LayoutTests/fast/writing-mode/flipped-blocks-text-map-local-to-container.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderInline.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-19  Dan Bernstein  <mitz@apple.com>
+
+        In flipped blocks writing modes, no flipping occurs when mapping RenderText’s local coordinates to absolute
+        https://bugs.webkit.org/show_bug.cgi?id=91780
+
+        Reviewed by Anders Carlsson.
+
+        * fast/writing-mode/flipped-blocks-text-map-local-to-container-expected.txt: Added.
+        * fast/writing-mode/flipped-blocks-text-map-local-to-container.html: Added.
+
 2012-07-19  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-19  Dan Bernstein  <mitz@apple.com>
+
+        In flipped blocks writing modes, no flipping occurs when mapping RenderText’s local coordinates to absolute
+        https://bugs.webkit.org/show_bug.cgi?id=91780
+
+        Reviewed by Anders Carlsson.
+
+        Test: fast/writing-mode/flipped-blocks-text-map-local-to-container.html
+
+        When RenderObject::mapLocalToContainer() was called on a RenderText with ApplyContainerFlip,
+        it would not flip (if the container was not a box) but it would always pass
+        DoNotApplyContainerFlip when recurring to the parent. This meant that no one applied the flip.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::mapLocalToContainer): Made the setting of applyContainerFlip to
+        false unconditional on the container actually being flipped.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::mapLocalToContainer): Rather than always passing
+        DoNotApplyContainerFlip when recurring to the parent, changed this function to pass through
+        the value of applyContainerFlip it was called with, unless it applied the flip itself.
+
 2012-07-19  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1136 +1136 @@
         return;
 
-    if (applyContainerFlip && o->isBox() && o->style()->isFlippedBlocksWritingMode()) {
-        IntPoint centerPoint = roundedIntPoint(transformState.mappedPoint());
-        transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(centerPoint) - centerPoint);
+    if (applyContainerFlip && o->isBox()) {
+        if (o->style()->isFlippedBlocksWritingMode()) {
+            IntPoint centerPoint = roundedIntPoint(transformState.mappedPoint());
+            transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(centerPoint) - centerPoint);
+        }
         applyContainerFlip = DoNotApplyContainerFlip;
     }

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1994 +1994 @@
 }
 
-void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot applyContainerFlip, bool* wasFixed) const
 {
     if (repaintContainer == this)
@@ -2005 +2005 @@
     // FIXME: this should call offsetFromContainer to share code, but I'm not sure it's ever called.
     LayoutPoint centerPoint = roundedLayoutPoint(transformState.mappedPoint());
-    if (o->isBox() && o->style()->isFlippedBlocksWritingMode())
-        transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint);
+    if (applyContainerFlip && o->isBox()) {
+        if (o->style()->isFlippedBlocksWritingMode())
+            transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint);
+        applyContainerFlip = DoNotApplyContainerFlip;
+    }
 
     LayoutSize columnOffset;
@@ -2016 +2019 @@
         transformState.move(-toRenderBox(o)->scrolledContentOffset());
 
-    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, DoNotApplyContainerFlip, wasFixed);
+    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, applyContainerFlip, wasFixed);
 }