Title: [106869] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 106869
- Author
- [email protected]
- Date
- 2012-02-06 16:14:40 -0800 (Mon, 06 Feb 2012)
Log Message
Reverting RenderFrameSet's canResizeRow/Column to operate on IntPoints.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp (106868 => 106869)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-02-07 00:09:22 UTC (rev 106868)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.cpp 2012-02-07 00:14:40 UTC (rev 106869)
@@ -746,13 +746,13 @@
return m_isResizing && m_cols.m_splitBeingResized != noSplit;
}
-bool RenderFrameSet::canResizeRow(const LayoutPoint& p) const
+bool RenderFrameSet::canResizeRow(const IntPoint& p) const
{
int r = hitTestSplit(m_rows, p.y());
return r != noSplit && m_rows.m_allowBorder[r] && !m_rows.m_preventResize[r];
}
-bool RenderFrameSet::canResizeColumn(const LayoutPoint& p) const
+bool RenderFrameSet::canResizeColumn(const IntPoint& p) const
{
int c = hitTestSplit(m_cols, p.x());
return c != noSplit && m_cols.m_allowBorder[c] && !m_cols.m_preventResize[c];
@@ -804,11 +804,12 @@
CursorDirective RenderFrameSet::getCursor(const LayoutPoint& point, Cursor& cursor) const
{
- if (canResizeRow(point)) {
+ IntPoint roundedPoint = roundedIntPoint(point);
+ if (canResizeRow(roundedPoint)) {
cursor = rowResizeCursor();
return SetCursor;
}
- if (canResizeColumn(point)) {
+ if (canResizeColumn(roundedPoint)) {
cursor = columnResizeCursor();
return SetCursor;
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.h (106868 => 106869)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.h 2012-02-07 00:09:22 UTC (rev 106868)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFrameSet.h 2012-02-07 00:14:40 UTC (rev 106869)
@@ -68,8 +68,8 @@
bool isResizingRow() const;
bool isResizingColumn() const;
- bool canResizeRow(const LayoutPoint&) const;
- bool canResizeColumn(const LayoutPoint&) const;
+ bool canResizeRow(const IntPoint&) const;
+ bool canResizeColumn(const IntPoint&) const;
void notifyFrameEdgeInfoChanged();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
