Changeset 138080 in webkit

Timestamp:

Dec 18, 2012 4:02:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Cannot click an element at 2nd line or more inside inline-block in vertical writing mode.
​https://bugs.webkit.org/show_bug.cgi?id=104775

Patch by Yuki Sekiguchi <​yuki.sekiguchi@access-company.com> on 2012-12-18
Reviewed by Dean Jackson.

Source/WebCore:

If the parent of an inline box changes writing mode, then the inline box must flip incoming hit point coordinates.
Otherwise, the coordinate will be misunderstood because the box has a different origin from its parent.
If the InlineBox doesn't flip its offset, its children will use the wrong offset
because they don't know their grandparent changed writing modes.
InlineBox::nodeAtPoint should flip accumulatedOffset like InlineBox::paint().

Test: fast/writing-mode/vertical-inline-block-hittest.html

• rendering/InlineBox.cpp:

(WebCore::InlineBox::nodeAtPoint):

LayoutTests:

Test that we can click 2nd line inside inline-block in vertical writing mode.

• fast/writing-mode/vertical-inline-block-hittest-expected.txt: Added.
• fast/writing-mode/vertical-inline-block-hittest.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/vertical-inline-block-hittest-expected.txt (added)
• LayoutTests/fast/writing-mode/vertical-inline-block-hittest.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-18  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
+
+        Cannot click an element at 2nd line or more inside inline-block in vertical writing mode.
+        https://bugs.webkit.org/show_bug.cgi?id=104775
+
+        Reviewed by Dean Jackson.
+
+        Test that we can click 2nd line inside inline-block in vertical writing mode.
+
+        * fast/writing-mode/vertical-inline-block-hittest-expected.txt: Added.
+        * fast/writing-mode/vertical-inline-block-hittest.html: Added.
+
 2012-12-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-18  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
+
+        Cannot click an element at 2nd line or more inside inline-block in vertical writing mode.
+        https://bugs.webkit.org/show_bug.cgi?id=104775
+
+        Reviewed by Dean Jackson.
+
+        If the parent of an inline box changes writing mode, then the inline box must flip incoming hit point coordinates.
+        Otherwise, the coordinate will be misunderstood because the box has a different origin from its parent.
+        If the InlineBox doesn't flip its offset, its children will use the wrong offset
+        because they don't know their grandparent changed writing modes.
+        InlineBox::nodeAtPoint should flip accumulatedOffset like InlineBox::paint().
+
+        Test: fast/writing-mode/vertical-inline-block-hittest.html
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::nodeAtPoint):
+
 2012-12-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -250 +250 @@
     // own stacking context.  (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1
     // specification.)
-    return renderer()->hitTest(request, result, locationInContainer, accumulatedOffset);
+    LayoutPoint childPoint = accumulatedOffset;
+    if (parent()->renderer()->style()->isFlippedBlocksWritingMode()) // Faster than calling containingBlock().
+        childPoint = renderer()->containingBlock()->flipForWritingModeForChild(toRenderBox(renderer()), childPoint);
+    
+    return renderer()->hitTest(request, result, locationInContainer, childPoint);
 }