Changeset 155972 in webkit

Timestamp:

Sep 17, 2013 10:40:45 AM (11 years ago)

Author:

Antti Koivisto

Message:

RenderBR should not be RenderText
​https://bugs.webkit.org/show_bug.cgi?id=121221

Rubber-stamped by Andreas Kling.

Fix assertion in these tests:

fast/repaint/selection-rl.html
fast/writing-mode/horizontal-bt-replaced-selection.html
fast/writing-mode/vertical-rl-replaced-selection.html

• rendering/InlineBox.cpp:

(WebCore::InlineBox::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Antti Koivisto  <antti@apple.com>
+
+        RenderBR should not be RenderText
+        https://bugs.webkit.org/show_bug.cgi?id=121221
+
+        Rubber-stamped by Andreas Kling.
+        
+        Fix assertion in these tests:
+
+        fast/repaint/selection-rl.html
+        fast/writing-mode/horizontal-bt-replaced-selection.html
+        fast/writing-mode/vertical-rl-replaced-selection.html
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::nodeAtPoint):
+
 2013-09-16  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -258 +258 @@
     // specification.)
     LayoutPoint childPoint = accumulatedOffset;
-    if (parent()->renderer().style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().
+    if (parent()->renderer().style()->isFlippedBlocksWritingMode() && !renderer().isBR()) // Faster than calling containingBlock().
         childPoint = m_renderer.containingBlock()->flipForWritingModeForChild(&toRenderBox(renderer()), childPoint);