Title: [149533] trunk/Source/WebCore
- Revision
- 149533
- Author
- [email protected]
- Date
- 2013-05-03 13:48:00 -0700 (Fri, 03 May 2013)
Log Message
Move pixelSnappedLayoutOverflowRect and maxLayoutOverflow from RenderBox
https://bugs.webkit.org/show_bug.cgi?id=115550
Reviewed by Simon Fraser.
The patch moves pixelSnappedLayoutOverflowRect and maxLayoutOverflow out
of RenderBox somewhere logically closer to their usage place.
pixelSnappedLayoutOverflowRect - moved to RenderView because it's called only
for RenderView at this moment.
There are other places when the overflow rect is pixel snapped but only after
the rect is adjusted for writing modes or inflated.
maxLayoutOverflow - moved to RenderTreeAsText.cpp as a static function because
it's used only there.
Tests: no new functional change.
* rendering/RenderBox.h: The functions declarations are removed.
* rendering/RenderTreeAsText.cpp:
(WebCore::maxLayoutOverflow):
* rendering/RenderView.h:
(WebCore::RenderView::pixelSnappedLayoutOverflowRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149532 => 149533)
--- trunk/Source/WebCore/ChangeLog 2013-05-03 20:43:27 UTC (rev 149532)
+++ trunk/Source/WebCore/ChangeLog 2013-05-03 20:48:00 UTC (rev 149533)
@@ -1,3 +1,29 @@
+2013-05-03 Andrei Bucur <[email protected]>
+
+ Move pixelSnappedLayoutOverflowRect and maxLayoutOverflow from RenderBox
+ https://bugs.webkit.org/show_bug.cgi?id=115550
+
+ Reviewed by Simon Fraser.
+
+ The patch moves pixelSnappedLayoutOverflowRect and maxLayoutOverflow out
+ of RenderBox somewhere logically closer to their usage place.
+
+ pixelSnappedLayoutOverflowRect - moved to RenderView because it's called only
+ for RenderView at this moment.
+ There are other places when the overflow rect is pixel snapped but only after
+ the rect is adjusted for writing modes or inflated.
+
+ maxLayoutOverflow - moved to RenderTreeAsText.cpp as a static function because
+ it's used only there.
+
+ Tests: no new functional change.
+
+ * rendering/RenderBox.h: The functions declarations are removed.
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::maxLayoutOverflow):
+ * rendering/RenderView.h:
+ (WebCore::RenderView::pixelSnappedLayoutOverflowRect):
+
2013-05-03 Andreas Kling <[email protected]>
StyleResolver: Have "list of matched rules" API vend internal types instead of CSSOM wrappers.
Modified: trunk/Source/WebCore/rendering/RenderBox.h (149532 => 149533)
--- trunk/Source/WebCore/rendering/RenderBox.h 2013-05-03 20:43:27 UTC (rev 149532)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2013-05-03 20:48:00 UTC (rev 149533)
@@ -176,8 +176,6 @@
// respectively are flipped when compared to their physical counterparts. For example minX is on the left in vertical-lr,
// but it is on the right in vertical-rl.
LayoutRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : clientBoxRect(); }
- IntRect pixelSnappedLayoutOverflowRect() const { return pixelSnappedIntRect(layoutOverflowRect()); }
- LayoutSize maxLayoutOverflow() const { return LayoutSize(layoutOverflowRect().maxX(), layoutOverflowRect().maxY()); }
LayoutUnit logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? layoutOverflowRect().x() : layoutOverflowRect().y(); }
LayoutUnit logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? layoutOverflowRect().maxX() : layoutOverflowRect().maxY(); }
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (149532 => 149533)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-05-03 20:43:27 UTC (rev 149532)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-05-03 20:48:00 UTC (rev 149533)
@@ -715,6 +715,12 @@
}
}
+static LayoutSize maxLayoutOverflow(const RenderBox* box)
+{
+ LayoutRect overflowRect = box->layoutOverflowRect();
+ return LayoutSize(overflowRect.maxX(), overflowRect.maxY());
+}
+
static void writeLayers(TextStream& ts, const RenderLayer* rootLayer, RenderLayer* l,
const LayoutRect& paintRect, int indent, RenderAsTextBehavior behavior)
{
@@ -723,7 +729,7 @@
if (rootLayer == l) {
paintDirtyRect.setWidth(max<LayoutUnit>(paintDirtyRect.width(), rootLayer->renderBox()->layoutOverflowRect().maxX()));
paintDirtyRect.setHeight(max<LayoutUnit>(paintDirtyRect.height(), rootLayer->renderBox()->layoutOverflowRect().maxY()));
- l->setSize(l->size().expandedTo(pixelSnappedIntSize(l->renderBox()->maxLayoutOverflow(), LayoutPoint(0, 0))));
+ l->setSize(l->size().expandedTo(pixelSnappedIntSize(maxLayoutOverflow(l->renderBox()), LayoutPoint(0, 0))));
}
// Calculate the clip rects we should use.
Modified: trunk/Source/WebCore/rendering/RenderView.h (149532 => 149533)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-05-03 20:43:27 UTC (rev 149532)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-05-03 20:48:00 UTC (rev 149533)
@@ -226,6 +226,8 @@
virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
+ IntRect pixelSnappedLayoutOverflowRect() const { return pixelSnappedIntRect(layoutOverflowRect()); }
+
protected:
virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
