Changeset 88385 in webkit
- Timestamp:
- Jun 8, 2011 2:15:25 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r88382 r88385 1 2011-06-08 Emil A Eklund <eae@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Convert RenderBlock::isPointInOverflowControl to IntPoint 6 https://bugs.webkit.org/show_bug.cgi?id=62312 7 8 Covered by existing tests. 9 10 * rendering/RenderBlock.cpp: 11 (WebCore::RenderBlock::isPointInOverflowControl): 12 (WebCore::RenderBlock::nodeAtPoint): 13 * rendering/RenderBlock.h: 14 * rendering/RenderListBox.cpp: 15 (WebCore::RenderListBox::isPointInOverflowControl): 16 * rendering/RenderListBox.h: 17 1 18 2011-06-08 James Simonsen <simonjam@chromium.org> 2 19 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r88319 r88385 3888 3888 } 3889 3889 3890 bool RenderBlock::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty)3890 bool RenderBlock::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset) 3891 3891 { 3892 3892 if (!scrollsOverflow()) 3893 3893 return false; 3894 3894 3895 return layer()->hitTestOverflowControls(result, pointInContainer - IntSize(tx, ty));3895 return layer()->hitTestOverflowControls(result, pointInContainer - toSize(accumulatedOffset)); 3896 3896 } 3897 3897 … … 3909 3909 } 3910 3910 3911 if ((hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChildBlockBackground) && isPointInOverflowControl(result, pointInContainer, localOffset.width(), localOffset.height())) {3911 if ((hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChildBlockBackground) && isPointInOverflowControl(result, pointInContainer, adjustedLocation)) { 3912 3912 updateHitTestResult(result, pointInContainer - localOffset); 3913 3913 // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet. -
trunk/Source/WebCore/rendering/RenderBlock.h
r88319 r88385 593 593 bool hitTestFloats(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset); 594 594 595 virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, int tx, int ty);595 virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset); 596 596 597 597 void computeInlinePreferredLogicalWidths(); -
trunk/Source/WebCore/rendering/RenderListBox.cpp
r88319 r88385 438 438 } 439 439 440 bool RenderListBox::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty)440 bool RenderListBox::isPointInOverflowControl(HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset) 441 441 { 442 442 if (!m_vBar) 443 443 return false; 444 444 445 IntRect vertRect( tx+ width() - borderRight() - m_vBar->width(),446 ty+ borderTop(),445 IntRect vertRect(accumulatedOffset.x() + width() - borderRight() - m_vBar->width(), 446 accumulatedOffset.y() + borderTop(), 447 447 m_vBar->width(), 448 448 height() - borderTop() - borderBottom()); -
trunk/Source/WebCore/rendering/RenderListBox.h
r88319 r88385 69 69 virtual IntRect controlClipRect(const IntPoint&) const; 70 70 71 virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, int tx, int ty);71 virtual bool isPointInOverflowControl(HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset); 72 72 73 73 virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);
Note: See TracChangeset
for help on using the changeset viewer.