Title: [113180] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 113180
- Author
- [email protected]
- Date
- 2012-04-04 06:04:39 -0700 (Wed, 04 Apr 2012)
Log Message
Cleaning jp RenderView changes. Reverting the print rect to an IntRect, and cleaning up a FIXME with hardcoded offsets.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderView.cpp (113179 => 113180)
--- branches/subpixellayout/Source/WebCore/rendering/RenderView.cpp 2012-04-04 12:47:54 UTC (rev 113179)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderView.cpp 2012-04-04 13:04:39 UTC (rev 113180)
@@ -217,7 +217,7 @@
{
// If we ever require layout but receive a paint anyway, something has gone horribly wrong.
ASSERT(!needsLayout());
- // We should never be called to paint with an offset not on device pixels.
+ // RenderViews should never be called to paint with an offset not on device pixels.
ASSERT(LayoutPoint(IntPoint(paintOffset.x(), paintOffset.y())) == paintOffset);
paintObject(paintInfo, paintOffset);
}
@@ -328,9 +328,7 @@
// rectangle.
r.moveBy(-vr.location());
- // FIXME: Hardcoded offsets here are not good.
- r.move(obj->borderLeft() + obj->paddingLeft(),
- obj->borderTop() + obj->paddingTop());
+ r.moveBy(obj->contentBoxRect().location());
obj->repaintRectangle(r, immediate);
}
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderView.h (113179 => 113180)
--- branches/subpixellayout/Source/WebCore/rendering/RenderView.h 2012-04-04 12:47:54 UTC (rev 113179)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderView.h 2012-04-04 13:04:39 UTC (rev 113180)
@@ -153,8 +153,8 @@
m_legacyPrinting.m_truncatorWidth = 0;
m_legacyPrinting.m_forcedPageBreak = false;
}
- const LayoutRect& printRect() const { return m_legacyPrinting.m_printRect; }
- void setPrintRect(const LayoutRect& r) { m_legacyPrinting.m_printRect = r; }
+ const IntRect& printRect() const { return m_legacyPrinting.m_printRect; }
+ void setPrintRect(const IntRect& r) { m_legacyPrinting.m_printRect = r; }
// End deprecated functions.
// Notifications that this view became visible in a window, or will be
@@ -257,7 +257,7 @@
int m_bestTruncatedAt;
int m_truncatedAt;
int m_truncatorWidth;
- LayoutRect m_printRect;
+ IntRect m_printRect;
bool m_forcedPageBreak;
};
LegacyPrinting m_legacyPrinting;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
