Changeset 123571 in webkit

Timestamp:

Jul 24, 2012, 9:42:44 PM (13 years ago)

Author:

mitz@apple.com

Message:

RenderBlock::positionForPoint can fail when the block or its children have a vertical writing mode
​https://bugs.webkit.org/show_bug.cgi?id=92202

Reviewed by Beth Dakin.

Source/WebCore:

Test: fast/writing-mode/positionForPoint.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::positionForPoint): Fixed two issues, each of which are covered by
one of the sub-tests in the new regression test: (1) changed to compare children’s logical
bounds against pointInLogicalContents, i.e. compare childern’s horizontal bounds to the
point’s horizontal component; and (2) changed to use logicalTopForChild and
logicalHeightForChild, which account for this block’s writing mode, instead of logicalTop
and logicalBottom, which are based on the child’s writing mode.

LayoutTests:

• fast/writing-mode/positionForPoint-expected.txt: Added.
• fast/writing-mode/positionForPoint.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/positionForPoint-expected.txt (added)
• LayoutTests/fast/writing-mode/positionForPoint.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2012-07-24  Dan Bernstein  <mitz@apple.com>
+
+        RenderBlock::positionForPoint can fail when the block or its children have a vertical writing mode
+        https://bugs.webkit.org/show_bug.cgi?id=92202
+
+        Reviewed by Beth Dakin.
+
+        * fast/writing-mode/positionForPoint-expected.txt: Added.
+        * fast/writing-mode/positionForPoint.html: Added.
+
 2012-07-24  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2012-07-24  Dan Bernstein  <mitz@apple.com>
+
+        RenderBlock::positionForPoint can fail when the block or its children have a vertical writing mode
+        https://bugs.webkit.org/show_bug.cgi?id=92202
+
+        Reviewed by Beth Dakin.
+
+        Test: fast/writing-mode/positionForPoint.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionForPoint): Fixed two issues, each of which are covered by
+        one of the sub-tests in the new regression test: (1) changed to compare children’s logical
+        bounds against pointInLogicalContents, i.e. compare childern’s horizontal bounds to the
+        point’s horizontal component; and (2) changed to use logicalTopForChild and
+        logicalHeightForChild, which account for this block’s writing mode, instead of logicalTop
+        and logicalBottom, which are based on the child’s writing mode.
+
 2012-07-24  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp ¶

@@ -5019 +5019 @@
 
     if (lastCandidateBox) {
-        if (pointInContents.y() > lastCandidateBox->logicalTop())
+        if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox))
             return positionForPointRespectingEditingBoundaries(this, lastCandidateBox, pointInContents);
 
         for (RenderBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
             // We hit child if our click is above the bottom of its padding box (like IE6/7 and FF3).
-            if (isChildHitTestCandidate(childBox) && pointInContents.y() < childBox->logicalBottom())
+            if (isChildHitTestCandidate(childBox) && pointInLogicalContents.y() < logicalTopForChild(childBox) + logicalHeightForChild(childBox))
                 return positionForPointRespectingEditingBoundaries(this, childBox, pointInContents);
         }