Diff
Modified: branches/subpixellayout/Source/WebCore/loader/SubframeLoader.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/loader/SubframeLoader.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/loader/SubframeLoader.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -171,7 +171,7 @@
IntSize size;
if (renderer)
- size = roundedIntSize(renderer->contentBoxRect());
+ size = roundedIntSize(LayoutSize(renderer->contentWidth(), renderer->contentHeight()));
else if (mediaElement->isVideo())
size = RenderVideo::defaultSize();
@@ -360,7 +360,7 @@
if (!frameLoader->checkIfRunInsecureContent(document()->securityOrigin(), url))
return false;
- IntSize contentSize = roundedIntSize(renderer->contentBoxRect().size());
+ IntSize contentSize = roundedIntSize(LayoutSize(renderer->contentWidth(), renderer->contentHeight()));
bool loadManually = document()->isPluginDocument() && !m_containsPlugins && toPluginDocument(document())->shouldLoadPluginManually();
RefPtr<Widget> widget = frameLoader->client()->createPlugin(contentSize,
pluginElement, url, paramNames, paramValues, mimeType, loadManually);
Modified: branches/subpixellayout/Source/WebCore/rendering/PaintInfo.h (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/PaintInfo.h 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/PaintInfo.h 2012-03-27 15:56:39 UTC (rev 112276)
@@ -98,7 +98,7 @@
}
#endif
- static IntRect infiniteRect() { return IntRect(std::numeric_limits<int>::min() / 2, std::numeric_limits<int>::min() / 2, std::numeric_limits<int>::max(), std::numeric_limits<int>::max()); }
+ static IntRect infiniteRect() { return IntRect(LayoutRect::infiniteRect()); }
// FIXME: Introduce setters/getters at some point. Requires a lot of changes throughout rendering/.
GraphicsContext* context;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayer.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -3634,7 +3634,7 @@
{
if (!parent()) {
// The root layer's clip rect is always infinite.
- clipRects.reset(LayoutRect::infiniteRect());
+ clipRects.reset(PaintInfo::infiniteRect());
return;
}
@@ -3649,7 +3649,7 @@
else
parentLayer->calculateClipRects(rootLayer, region, clipRects);
} else
- clipRects.reset(LayoutRect::infiniteRect());
+ clipRects.reset(PaintInfo::infiniteRect());
// A fixed object is essentially the root of its containing block hierarchy, so when
// we encounter such an object, we reset our clip rects to the fixedClipRect.
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayerBacking.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -366,7 +366,7 @@
static IntRect clipBox(RenderBox* renderer)
{
- LayoutRect result = LayoutRect::infiniteRect();
+ LayoutRect result = PaintInfo::infiniteRect();
if (renderer->hasOverflowClip())
result = renderer->overflowClipRect(LayoutPoint(), 0); // FIXME: Incorrect for CSS regions.
@@ -438,7 +438,7 @@
// layer. Note that we call it with temporaryClipRects = true because normally when computing clip rects
// for a compositing layer, rootLayer is the layer itself.
IntRect parentClipRect = pixelSnappedIntRect(m_owningLayer->backgroundClipRect(compAncestor, 0, true).rect()); // FIXME: Incorrect for CSS regions.
- ASSERT(parentClipRect != LayoutRect::infiniteRect());
+ ASSERT(parentClipRect != PaintInfo::infiniteRect());
m_ancestorClippingLayer->setPosition(FloatPoint() + (parentClipRect.location() - graphicsLayerParentLocation));
m_ancestorClippingLayer->setSize(parentClipRect.size());
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderLayerCompositor.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -1429,7 +1429,7 @@
if (!computeClipRoot || computeClipRoot == layer)
return false;
- return layer->backgroundClipRect(computeClipRoot, 0, true).rect() != LayoutRect::infiniteRect(); // FIXME: Incorrect for CSS regions.
+ return layer->backgroundClipRect(computeClipRoot, 0, true).rect() != PaintInfo::infiniteRect(); // FIXME: Incorrect for CSS regions.
}
// Return true if the given layer is a stacking context and has compositing child
Modified: branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGText.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGText.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/svg/RenderSVGText.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -282,7 +282,7 @@
if (!SVGRenderSupport::pointInClippingArea(this, localPoint))
return false;
- return RenderBlock::nodeAtPoint(request, result, roundedIntPoint(localPoint), IntPoint(), hitTestAction);
+ return RenderBlock::nodeAtPoint(request, result, flooredIntPoint(localPoint), IntPoint(), hitTestAction);
}
}
Modified: branches/subpixellayout/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp (112275 => 112276)
--- branches/subpixellayout/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp 2012-03-27 15:44:16 UTC (rev 112275)
+++ branches/subpixellayout/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp 2012-03-27 15:56:39 UTC (rev 112276)
@@ -109,7 +109,7 @@
ASSERT(image);
ASSERT(image->context());
- PaintInfo info(image->context(), IntRect(LayoutRect::infiniteRect()), PaintPhaseForeground, 0, 0, 0, 0);
+ PaintInfo info(image->context(), IntRect(PaintInfo::infiniteRect()), PaintPhaseForeground, 0, 0, 0, 0);
AffineTransform& contentTransformation = currentContentTransformation();
AffineTransform savedContentTransformation = contentTransformation;
