Changeset 123990 in webkit
- Timestamp:
- Jul 29, 2012 5:44:08 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r123988 r123990 1 2012-07-29 Dan Bernstein <mitz@apple.com> 2 3 Hit testing in the gap between pages returns incorrect results in flipped blocks writing modes 4 https://bugs.webkit.org/show_bug.cgi?id=92600 5 6 Reviewed by Simon Fraser. 7 8 * fast/multicol/hit-test-gap-between-pages-flipped-expected.txt: Added. 9 * fast/multicol/hit-test-gap-between-pages-flipped.html: Added. 10 1 11 2012-07-29 Dan Bernstein <mitz@apple.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r123988 r123990 1 2012-07-29 Dan Bernstein <mitz@apple.com> 2 3 Hit testing in the gap between pages returns incorrect results in flipped blocks writing modes 4 https://bugs.webkit.org/show_bug.cgi?id=92600 5 6 Reviewed by Simon Fraser. 7 8 Test: fast/multicol/hit-test-gap-between-pages-flipped.html 9 10 * rendering/RenderBlock.h: 11 (WebCore::RenderBlock): Promoted offsetForContents() from private to protected, and demoted 12 adjustPointToColumnContents() back to private. 13 * rendering/RenderLayer.cpp: 14 (WebCore::RenderLayer::hitTest): Changed to flip the point passed to updateHitTestResults(). 15 * rendering/RenderView.cpp: 16 (WebCore::RenderView::updateHitTestResult): Changed to call offsetForContents(), which, as 17 of r123977, correctly accounts for flippedness. 18 1 19 2012-07-29 Dan Bernstein <mitz@apple.com> 2 20 -
trunk/Source/WebCore/rendering/RenderBlock.h
r123524 r123990 474 474 void computeInitialRegionRangeForBlock(); 475 475 void computeRegionRangeForBlock(); 476 476 477 477 virtual void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); 478 478 479 479 private: 480 480 virtual RenderObjectChildList* virtualChildren() { return children(); } … … 808 808 virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0); 809 809 810 void adjustPointToColumnContents(LayoutPoint&) const; 810 811 void adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const; // Helper function for borderFitAdjust 811 812 … … 816 817 Position positionForBox(InlineBox*, bool start = true) const; 817 818 VisiblePosition positionForPointWithInlineChildren(const LayoutPoint&); 818 819 // Adjust from painting offsets to the local coords of this renderer820 void offsetForContents(LayoutPoint&) const;821 819 822 820 virtual void calcColumnWidth(); … … 965 963 LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTopAfterClear, LayoutUnit estimateWithoutPagination, RenderBox* child, bool atBeforeSideOfBlock); 966 964 967 void adjustPointToColumnContents(LayoutPoint&) const; 965 // Adjust from painting offsets to the local coords of this renderer 966 void offsetForContents(LayoutPoint&) const; 968 967 969 968 // 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
r123971 r123990 3407 3407 // exited the WebView, and so hit testing over a scrollbar hits the content document. 3408 3408 if ((request.active() || request.release()) && isRootLayer()) { 3409 renderer()->updateHitTestResult(result, result.point());3409 renderer()->updateHitTestResult(result, toRenderView(renderer())->flipForWritingMode(result.point())); 3410 3410 insideLayer = this; 3411 3411 } -
trunk/Source/WebCore/rendering/RenderView.cpp
r123050 r123990 855 855 856 856 LayoutPoint adjustedPoint = point; 857 adjustPointToColumnContents(adjustedPoint);857 offsetForContents(adjustedPoint); 858 858 859 859 result.setLocalPoint(adjustedPoint);
Note: See TracChangeset
for help on using the changeset viewer.