Changeset 123990 in webkit

Timestamp:

Jul 29, 2012 5:44:08 PM (12 years ago)

Author:

mitz@apple.com

Message:

Hit testing in the gap between pages returns incorrect results in flipped blocks writing modes
​https://bugs.webkit.org/show_bug.cgi?id=92600

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/multicol/hit-test-gap-between-pages-flipped.html

• rendering/RenderBlock.h:

(WebCore::RenderBlock): Promoted offsetForContents() from private to protected, and demoted
adjustPointToColumnContents() back to private.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::hitTest): Changed to flip the point passed to updateHitTestResults().

• rendering/RenderView.cpp:

(WebCore::RenderView::updateHitTestResult): Changed to call offsetForContents(), which, as
of r123977, correctly accounts for flippedness.

LayoutTests:

• fast/multicol/hit-test-gap-between-pages-flipped-expected.txt: Added.
• fast/multicol/hit-test-gap-between-pages-flipped.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/hit-test-gap-between-pages-flipped-expected.txt (added)
• LayoutTests/fast/multicol/hit-test-gap-between-pages-flipped.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (4 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-29  Dan Bernstein  <mitz@apple.com>
+
+        Hit testing in the gap between pages returns incorrect results in flipped blocks writing modes
+        https://bugs.webkit.org/show_bug.cgi?id=92600
+
+        Reviewed by Simon Fraser.
+
+        * fast/multicol/hit-test-gap-between-pages-flipped-expected.txt: Added.
+        * fast/multicol/hit-test-gap-between-pages-flipped.html: Added.
+
 2012-07-29  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-29  Dan Bernstein  <mitz@apple.com>
+
+        Hit testing in the gap between pages returns incorrect results in flipped blocks writing modes
+        https://bugs.webkit.org/show_bug.cgi?id=92600
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/multicol/hit-test-gap-between-pages-flipped.html
+
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock): Promoted offsetForContents() from private to protected, and demoted
+        adjustPointToColumnContents() back to private.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hitTest): Changed to flip the point passed to updateHitTestResults().
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::updateHitTestResult): Changed to call offsetForContents(), which, as
+        of r123977, correctly accounts for flippedness.
+
 2012-07-29  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -474 +474 @@
     void computeInitialRegionRangeForBlock();
     void computeRegionRangeForBlock();
-    
+
     virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
-    
+
 private:
     virtual RenderObjectChildList* virtualChildren() { return children(); }
@@ -808 +808 @@
     virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0);
 
+    void adjustPointToColumnContents(LayoutPoint&) const;
     void adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const; // Helper function for borderFitAdjust
 
@@ -816 +817 @@
     Position positionForBox(InlineBox*, bool start = true) const;
     VisiblePosition positionForPointWithInlineChildren(const LayoutPoint&);
-
-    // Adjust from painting offsets to the local coords of this renderer
-    void offsetForContents(LayoutPoint&) const;
 
     virtual void calcColumnWidth();
@@ -965 +963 @@
     LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTopAfterClear, LayoutUnit estimateWithoutPagination, RenderBox* child, bool atBeforeSideOfBlock);
 
-    void adjustPointToColumnContents(LayoutPoint&) const;
+    // Adjust from painting offsets to the local coords of this renderer
+    void offsetForContents(LayoutPoint&) const;
 
     // This function is called to test a line box that has moved in the block direction to see if it has ended up in a new

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3407 +3407 @@
         // exited the WebView, and so hit testing over a scrollbar hits the content document.
         if ((request.active() || request.release()) && isRootLayer()) {
-            renderer()->updateHitTestResult(result, result.point());
+            renderer()->updateHitTestResult(result, toRenderView(renderer())->flipForWritingMode(result.point()));
             insideLayer = this;
         }

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -855 +855 @@
 
         LayoutPoint adjustedPoint = point;
-        adjustPointToColumnContents(adjustedPoint);
+        offsetForContents(adjustedPoint);
 
         result.setLocalPoint(adjustedPoint);