Changeset 71668 in webkit

Timestamp:

Nov 9, 2010 12:46:15 PM (13 years ago)

Author:

mitz@apple.com

Message:

WebCore: Made tables hit-test correctly in all writing modes.

Reviewed by Dave Hyatt.

Part of: Make tables work with vertical text
​https://bugs.webkit.org/show_bug.cgi?id=46417

Test: fast/blockflow/table-hit-test.html

• rendering/RenderTable.cpp:

(WebCore::RenderTable::nodeAtPoint):

• rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::nodeAtPoint):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::nodeAtPoint):

LayoutTests: Make tables work with vertical text
​https://bugs.webkit.org/show_bug.cgi?id=46417

Reviewed by Dave Hyatt.

• fast/blockflow/table-hit-test-expected.txt: Added.
• fast/blockflow/table-hit-test.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/blockflow/table-hit-test-expected.txt (added)
• LayoutTests/fast/blockflow/table-hit-test.html (added)
• WebCore/ChangeLog (modified) (2 diffs)
• WebCore/rendering/RenderTable.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTableRow.cpp (modified) (1 diff)
• WebCore/rendering/RenderTableSection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-09  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Make tables work with vertical text
+        https://bugs.webkit.org/show_bug.cgi?id=46417
+
+        * fast/blockflow/table-hit-test-expected.txt: Added.
+        * fast/blockflow/table-hit-test.html: Added.
+
 2010-11-09  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-09  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Made tables hit-test correctly in all writing modes.
+
+        Part of: Make tables work with vertical text
+        https://bugs.webkit.org/show_bug.cgi?id=46417
+
+        Test: fast/blockflow/table-hit-test.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::nodeAtPoint):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::nodeAtPoint):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::nodeAtPoint):
+
 2010-11-09  Simon Fraser  <simon.fraser@apple.com>
 
@@ -2386 +2404 @@
         table’s are not supported yet.
 
-        Make tables work with vertical text
+        Part of: Make tables work with vertical text
         https://bugs.webkit.org/show_bug.cgi?id=46417
 

trunk/WebCore/rendering/RenderTable.cpp

@@ -1153 +1153 @@
     if (!hasOverflowClip() || overflowClipRect(tx, ty).intersects(result.rectForPoint(xPos, yPos))) {
         for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
-            if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child == m_caption) &&
-                child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
-                updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
-                return true;
+            if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child == m_caption)) {
+                IntPoint childPoint = flipForWritingMode(toRenderBox(child), IntPoint(tx, ty), ParentToChildFlippingAdjustment);
+                if (child->nodeAtPoint(request, result, xPos, yPos, childPoint.x(), childPoint.y(), action)) {
+                    updateHitTestResult(result, IntPoint(xPos - childPoint.x(), yPos - childPoint.y()));
+                    return true;
+                }
             }
         }
@@ -1164 +1166 @@
     IntRect boundsRect = IntRect(tx, ty, width(), height());
     if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos, yPos))) {
-        updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
+        updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos - ty)));
         if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect))
             return true;

trunk/WebCore/rendering/RenderTableRow.cpp

@@ -176 +176 @@
         // table-specific hit-test method (which we should do for performance reasons anyway),
         // then we can remove this check.
-        if (child->isTableCell() && !toRenderBox(child)->hasSelfPaintingLayer() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
-            updateHitTestResult(result, IntPoint(x - tx, y - ty));
-            return true;
+        if (child->isTableCell() && !toRenderBox(child)->hasSelfPaintingLayer()) {
+            IntPoint cellPoint = flipForWritingMode(toRenderTableCell(child), IntPoint(tx, ty), ParentToChildFlippingAdjustment);
+            if (child->nodeAtPoint(request, result, x, y, cellPoint.x(), cellPoint.y(), action)) {
+                updateHitTestResult(result, IntPoint(x - cellPoint.x(), y - cellPoint.y()));
+                return true;
+            }
         }
     }

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -1219 +1219 @@
             // table-specific hit-test method (which we should do for performance reasons anyway),
             // then we can remove this check.
-            if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
-                updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
-                return true;
+            if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer()) {
+                IntPoint childPoint = flipForWritingMode(toRenderBox(child), IntPoint(tx, ty), ParentToChildFlippingAdjustment);
+                if (child->nodeAtPoint(request, result, xPos, yPos, childPoint.x(), childPoint.y(), action)) {
+                    updateHitTestResult(result, IntPoint(xPos - childPoint.x(), yPos - childPoint.y()));
+                    return true;
+                }
             }
         }
@@ -1227 +1230 @@
     }
 
-    int relativeY = yPos - ty;
-    // leftrow corresponds to the first row that starts after the y mouse position
-    unsigned leftrow = std::upper_bound(m_rowPos.begin(), m_rowPos.end(), relativeY) - m_rowPos.begin();
-    if (leftrow == m_rowPos.size())
+    IntPoint location = IntPoint(xPos - tx, yPos - ty);
+    if (style()->isFlippedBlocksWritingMode()) {
+        if (style()->isHorizontalWritingMode())
+            location.setY(height() - location.y());
+        else
+            location.setX(width() - location.x());
+    }
+
+    int offsetInColumnDirection = style()->isHorizontalWritingMode() ? location.y() : location.x();
+    // Find the first row that starts after offsetInColumnDirection.
+    unsigned nextRow = std::upper_bound(m_rowPos.begin(), m_rowPos.end(), offsetInColumnDirection) - m_rowPos.begin();
+    if (nextRow == m_rowPos.size())
         return false;
-    // Grab the last row that starts before the y mouse position.
-    if (leftrow > 0)
-        --leftrow;
+    // Now set hitRow to the index of the hit row, or 0.
+    unsigned hitRow = nextRow > 0 ? nextRow - 1 : 0;
 
     Vector<int>& columnPos = table()->columnPositions();
-    bool rtl = !style()->isLeftToRightDirection();
-    int relativeX = xPos - tx;
-    if (rtl)
-        relativeX = columnPos[columnPos.size() - 1] - relativeX;
-
-    unsigned leftcol = std::lower_bound(columnPos.begin(), columnPos.end(), relativeX) - columnPos.begin();
-    if (leftcol == columnPos.size())
+    int offsetInRowDirection = style()->isHorizontalWritingMode() ? location.x() : location.y();
+    if (!style()->isLeftToRightDirection())
+        offsetInRowDirection = columnPos[columnPos.size() - 1] - offsetInRowDirection;
+
+    unsigned nextColumn = std::lower_bound(columnPos.begin(), columnPos.end(), offsetInRowDirection) - columnPos.begin();
+    if (nextColumn == columnPos.size())
         return false;
-    if (leftcol > 0)
-        --leftcol;
-
-    CellStruct& current = cellAt(leftrow, leftcol);
+    unsigned hitColumn = nextColumn > 0 ? nextColumn - 1 : 0;
+
+    CellStruct& current = cellAt(hitRow, hitColumn);
 
     // If the cell is empty, there's nothing to do
@@ -1256 +1264 @@
     for (int i = current.cells.size() - 1; i >= 0; --i) {
         RenderTableCell* cell = current.cells[i];
-        if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
-            updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
+        IntPoint cellPoint = flipForWritingMode(cell, IntPoint(tx, ty), ParentToChildFlippingAdjustment);
+        if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, xPos, yPos, cellPoint.x(), cellPoint.y(), action)) {
+            updateHitTestResult(result, IntPoint(xPos - cellPoint.x(), yPos - cellPoint.y()));
             return true;
         }