Changeset 123980 in webkit

Timestamp:

Jul 29, 2012 10:27:35 AM (12 years ago)

Author:

mitz@apple.com

Message:

In flipped blocks, a point on the top edge of a box is considered outside the box (and vice versa)
​https://bugs.webkit.org/show_bug.cgi?id=92593

Reviewed by Simon Fraser.

Source/WebCore:

With respect to hit testing, boxes should always behave as half-open intervals which include
the physical top and left edges and not the bottom and right edges.
RenderBlock::positionForPoint was not adhering to this, since it was comparing flipped
coordinates.

Tests: fast/writing-mode/flipped-blocks-hit-test-box-edges.html

fast/writing-mode/flipped-blocks-hit-test-line-edges.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::positionForPointWithInlineChildren): When blocks are flipped, changed
strict inequalities of y coordinates into non-strict ones and non-strict inequalities into
strict ones.
(WebCore::RenderBlock::positionForPoint): Ditto, except for the test for being under the top
of the last candidate box, which was made non-strict in the unflipped case and remained
strict.

LayoutTests:

• fast/writing-mode/flipped-blocks-hit-test-box-edges-expected.txt: Added.
• fast/writing-mode/flipped-blocks-hit-test-box-edges.html: Added.
• fast/writing-mode/flipped-blocks-hit-test-line-edges-expected.txt: Added.
• fast/writing-mode/flipped-blocks-hit-test-line-edges.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-box-edges-expected.txt (added)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-box-edges.html (added)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-line-edges-expected.txt (added)
• LayoutTests/fast/writing-mode/flipped-blocks-hit-test-line-edges.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-29  Dan Bernstein  <mitz@apple.com>
+
+        In flipped blocks, a point on the top edge of a box is considered outside the box (and vice versa)
+        https://bugs.webkit.org/show_bug.cgi?id=92593
+
+        Reviewed by Simon Fraser.
+
+        * fast/writing-mode/flipped-blocks-hit-test-box-edges-expected.txt: Added.
+        * fast/writing-mode/flipped-blocks-hit-test-box-edges.html: Added.
+        * fast/writing-mode/flipped-blocks-hit-test-line-edges-expected.txt: Added.
+        * fast/writing-mode/flipped-blocks-hit-test-line-edges.html: Added.
+
 2012-07-29  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-29  Dan Bernstein  <mitz@apple.com>
+
+        In flipped blocks, a point on the top edge of a box is considered outside the box (and vice versa)
+        https://bugs.webkit.org/show_bug.cgi?id=92593
+
+        Reviewed by Simon Fraser.
+
+        With respect to hit testing, boxes should always behave as half-open intervals which include
+        the physical top and left edges and not the bottom and right edges.
+        RenderBlock::positionForPoint was not adhering to this, since it was comparing flipped
+        coordinates.
+
+        Tests: fast/writing-mode/flipped-blocks-hit-test-box-edges.html
+               fast/writing-mode/flipped-blocks-hit-test-line-edges.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionForPointWithInlineChildren): When blocks are flipped, changed
+        strict inequalities of y coordinates into non-strict ones and non-strict inequalities into
+        strict ones.
+        (WebCore::RenderBlock::positionForPoint): Ditto, except for the test for being under the top
+        of the last candidate box, which was made non-strict in the unflipped case and remained
+        strict.
+
 2012-07-28  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4918 +4918 @@
 
     bool linesAreFlipped = style()->isFlippedLinesWritingMode();
+    bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
 
     // look for the closest line box in the root box which is at the passed-in y coordinate
@@ -4929 +4930 @@
             firstRootBoxWithChildren = root;
 
-        if (!linesAreFlipped && root->isFirstAfterPageBreak() && pointInLogicalContents.y() < root->lineTopWithLeading())
+        if (!linesAreFlipped && root->isFirstAfterPageBreak() && (pointInLogicalContents.y() < root->lineTopWithLeading()
+            || (blocksAreFlipped && pointInLogicalContents.y() == root->lineTopWithLeading())))
             break;
 
@@ -4935 +4937 @@
 
         // check if this root line box is located at this y coordinate
-        if (pointInLogicalContents.y() < root->selectionBottom()) {
+        if (pointInLogicalContents.y() < root->selectionBottom() || (blocksAreFlipped && pointInLogicalContents.y() == root->selectionBottom())) {
             if (linesAreFlipped) {
                 RootInlineBox* nextRootBoxWithChildren = root->nextRootBox();
@@ -4941 +4943 @@
                     nextRootBoxWithChildren = nextRootBoxWithChildren->nextRootBox();
 
-                if (nextRootBoxWithChildren && nextRootBoxWithChildren->isFirstAfterPageBreak() && pointInLogicalContents.y() >= nextRootBoxWithChildren->lineTopWithLeading())
+                if (nextRootBoxWithChildren && nextRootBoxWithChildren->isFirstAfterPageBreak() && (pointInLogicalContents.y() > nextRootBoxWithChildren->lineTopWithLeading()
+                    || (!blocksAreFlipped && pointInLogicalContents.y() == nextRootBoxWithChildren->lineTopWithLeading())))
                     continue;
             }
@@ -4958 +4961 @@
 
     if (closestBox) {
-        if (moveCaretToBoundary && pointInLogicalContents.y() < firstRootBoxWithChildren->selectionTop()
-            && pointInLogicalContents.y() < firstRootBoxWithChildren->logicalTop()) {
-            InlineBox* box = firstRootBoxWithChildren->firstLeafChild();
-            if (box->isLineBreak()) {
-                if (InlineBox* newBox = box->nextLeafChildIgnoringLineBreak())
-                    box = newBox;
+        if (moveCaretToBoundary) {
+            LayoutUnit firstRootBoxWithChildrenTop = min<LayoutUnit>(firstRootBoxWithChildren->selectionTop(), firstRootBoxWithChildren->logicalTop());
+            if (pointInLogicalContents.y() < firstRootBoxWithChildrenTop
+                || (blocksAreFlipped && pointInLogicalContents.y() == firstRootBoxWithChildrenTop)) {
+                InlineBox* box = firstRootBoxWithChildren->firstLeafChild();
+                if (box->isLineBreak()) {
+                    if (InlineBox* newBox = box->nextLeafChildIgnoringLineBreak())
+                        box = newBox;
+                }
+                // y coordinate is above first root line box, so return the start of the first
+                return VisiblePosition(positionForBox(box, true), DOWNSTREAM);
             }
-            // y coordinate is above first root line box, so return the start of the first
-            return VisiblePosition(positionForBox(box, true), DOWNSTREAM);
         }
 
@@ -5026 +5032 @@
         lastCandidateBox = lastCandidateBox->previousSiblingBox();
 
+    bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
     if (lastCandidateBox) {
-        if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox))
+        if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox)
+            || (!blocksAreFlipped && pointInLogicalContents.y() == logicalTopForChild(lastCandidateBox)))
             return positionForPointRespectingEditingBoundaries(this, lastCandidateBox, pointInContents);
 
         for (RenderBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
+            if (!isChildHitTestCandidate(childBox))
+                continue;
+            LayoutUnit childLogicalBottom = logicalTopForChild(childBox) + logicalHeightForChild(childBox);
             // We hit child if our click is above the bottom of its padding box (like IE6/7 and FF3).
-            if (isChildHitTestCandidate(childBox) && pointInLogicalContents.y() < logicalTopForChild(childBox) + logicalHeightForChild(childBox))
+            if (isChildHitTestCandidate(childBox) && (pointInLogicalContents.y() < childLogicalBottom
+                || (blocksAreFlipped && pointInLogicalContents.y() == childLogicalBottom)))
                 return positionForPointRespectingEditingBoundaries(this, childBox, pointInContents);
         }