Changeset 123973 in webkit

Timestamp:

Jul 28, 2012 2:40:48 PM (12 years ago)

Author:

mitz@apple.com

Message:

In flipped lines writing modes, hit testing at the beginning of a column may return a result from the previous column
​https://bugs.webkit.org/show_bug.cgi?id=92566

Reviewed by Simon Fraser.

Source/WebCore:

Enhanced the fix for <​http://webkit.org/b/92524> to work with flipped lines.

Extended fast/multicol/hit-test-end-of-column-with-line-height.html.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::positionForPointWithInlineChildren): For flipped lines, check if the
hit line is the last one before a page break, and in that case, check if the hit point was
after the break.

LayoutTests:

• fast/multicol/hit-test-end-of-column-with-line-height-expected.txt: Updated.
• fast/multicol/hit-test-end-of-column-with-line-height.html: Extended with tests for

horizontal-bt.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/hit-test-end-of-column-with-line-height-expected.txt (modified) (1 diff)
• LayoutTests/fast/multicol/hit-test-end-of-column-with-line-height.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-28  Dan Bernstein  <mitz@apple.com>
+
+        In flipped lines writing modes, hit testing at the beginning of a column may return a result from the previous column
+        https://bugs.webkit.org/show_bug.cgi?id=92566
+
+        Reviewed by Simon Fraser.
+
+        * fast/multicol/hit-test-end-of-column-with-line-height-expected.txt: Updated.
+        * fast/multicol/hit-test-end-of-column-with-line-height.html: Extended with tests for
+        horizontal-bt.
+
 2012-07-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/multicol/hit-test-end-of-column-with-line-height-expected.txt

@@ -2 +2 @@
 PASS
 PASS
+PASS
+PASS
 

trunk/LayoutTests/fast/multicol/hit-test-end-of-column-with-line-height.html

@@ -28 +28 @@
     hitOffset = document.caretRangeFromPoint(target.offsetLeft + 250, target.offsetTop + 2).startOffset;
     log(hitOffset === 14 ? "PASS" : "FAIL: hit offset " + hitOffset + ".");
+
+    // Now test with a flipped lines writing mode.
+    target.style.webkitWritingMode = "horizontal-bt";
+
+    // Clicking above the last line in the first column should not select anything from the first
+    // line on the second column.
+    hitOffset = document.caretRangeFromPoint(target.offsetLeft + 190, target.offsetTop + 3).startOffset;
+    log(hitOffset === 11 ? "PASS" : "FAIL: hit offset " + hitOffset + ".");
+
+    // Clicking below the first line in the second column should not snap to the beginning of the line.
+    hitOffset = document.caretRangeFromPoint(target.offsetLeft + 250, target.offsetTop + 78).startOffset;
+    log(hitOffset === 14 ? "PASS" : "FAIL: hit offset " + hitOffset + ".");
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-28  Dan Bernstein  <mitz@apple.com>
+
+        In flipped lines writing modes, hit testing at the beginning of a column may return a result from the previous column
+        https://bugs.webkit.org/show_bug.cgi?id=92566
+
+        Reviewed by Simon Fraser.
+
+        Enhanced the fix for <http://webkit.org/b/92524> to work with flipped lines.
+
+        Extended fast/multicol/hit-test-end-of-column-with-line-height.html.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionForPointWithInlineChildren): For flipped lines, check if the
+        hit line is the last one before a page break, and in that case, check if the hit point was
+        after the break.
+
 2012-07-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4917 +4917 @@
         return createVisiblePosition(0, DOWNSTREAM);
 
+    bool linesAreFlipped = style()->isFlippedLinesWritingMode();
+
     // look for the closest line box in the root box which is at the passed-in y coordinate
     InlineBox* closestBox = 0;
@@ -4927 +4929 @@
             firstRootBoxWithChildren = root;
 
-        if (root->isFirstAfterPageBreak() && pointInLogicalContents.y() < root->lineTopWithLeading())
+        if (!linesAreFlipped && root->isFirstAfterPageBreak() && pointInLogicalContents.y() < root->lineTopWithLeading())
             break;
 
@@ -4934 +4936 @@
         // check if this root line box is located at this y coordinate
         if (pointInLogicalContents.y() < root->selectionBottom()) {
+            if (linesAreFlipped) {
+                RootInlineBox* nextRootBoxWithChildren = root->nextRootBox();
+                while (nextRootBoxWithChildren && !nextRootBoxWithChildren->firstLeafChild())
+                    nextRootBoxWithChildren = nextRootBoxWithChildren->nextRootBox();
+
+                if (nextRootBoxWithChildren && nextRootBoxWithChildren->isFirstAfterPageBreak() && pointInLogicalContents.y() >= nextRootBoxWithChildren->lineTopWithLeading())
+                    continue;
+            }
             closestBox = root->closestLeafChildForLogicalLeftPosition(pointInLogicalContents.x());
             if (closestBox)