Changeset 161381 in webkit

Timestamp:

Jan 6, 2014, 3:50:43 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Add {IntRect, FloatRect}::infiniteRect() and ::isInfinite()
​https://bugs.webkit.org/show_bug.cgi?id=126537

Reviewed by Simon Fraser.

• platform/graphics/FloatRect.h:

(WebCore::FloatRect::infiniteRect):
(WebCore::FloatRect::isInfinite):

• platform/graphics/IntRect.h:

(WebCore::IntRect::infiniteRect):
(WebCore::IntRect::isInfinite):
Add infiniteRect() and isInfinite() to FloatRect and IntRect.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setNeedsDisplay):

• rendering/PaintInfo.h:

(WebCore::PaintInfo::applyTransform):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::fragmentsBoundingBox):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::collectFragments):
(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderLayerBacking.cpp:

(WebCore::clipBox):
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::clippedByAncestor):

• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::renderSubtreeToImageBuffer):
Adopt the new functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FloatRect.h (modified) (2 diffs)
• platform/graphics/IntRect.h (modified) (2 diffs)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• rendering/PaintInfo.h (modified) (2 diffs)
• rendering/RenderFlowThread.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (7 diffs)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/svg/SVGRenderingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-06  Tim Horton  <timothy_horton@apple.com>
+
+        Add {IntRect, FloatRect}::infiniteRect() and ::isInfinite()
+        https://bugs.webkit.org/show_bug.cgi?id=126537
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/FloatRect.h:
+        (WebCore::FloatRect::infiniteRect):
+        (WebCore::FloatRect::isInfinite):
+        * platform/graphics/IntRect.h:
+        (WebCore::IntRect::infiniteRect):
+        (WebCore::IntRect::isInfinite):
+        Add infiniteRect() and isInfinite() to FloatRect and IntRect.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setNeedsDisplay):
+        * rendering/PaintInfo.h:
+        (WebCore::PaintInfo::applyTransform):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::fragmentsBoundingBox):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::collectFragments):
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::clipBox):
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::clippedByAncestor):
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::renderSubtreeToImageBuffer):
+        Adopt the new functions.
+
 2014-01-06  Seokju Kwon  <seokju@webkit.org>
 

trunk/Source/WebCore/platform/graphics/FloatRect.h

@@ -194 +194 @@
     void dump(PrintStream& out) const;
 
+    static FloatRect infiniteRect();
+    bool isInfinite() const;
+
 private:
     FloatPoint m_location;
@@ -247 +250 @@
 }
 
+inline FloatRect FloatRect::infiniteRect()
+{
+    static FloatRect infiniteRect(-std::numeric_limits<float>::max() / 2, -std::numeric_limits<float>::max() / 2, std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+    return infiniteRect;
+}
+
+inline bool FloatRect::isInfinite() const
+{
+    return *this == infiniteRect();
+}
+
 IntRect enclosingIntRect(const FloatRect&);
 

trunk/Source/WebCore/platform/graphics/IntRect.h

@@ -204 +204 @@
     void dump(PrintStream& out) const;
 
+    static IntRect infiniteRect();
+    bool isInfinite() const;
+
 private:
     IntPoint m_location;
@@ -235 +238 @@
 }
 
+inline IntRect IntRect::infiniteRect()
+{
+    static IntRect infiniteRect(-std::numeric_limits<int>::max() / 2, -std::numeric_limits<int>::max() / 2, std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
+    return infiniteRect;
+}
+
+inline bool IntRect::isInfinite() const
+{
+    return *this == infiniteRect();
+}
+
 #if USE(CG)
 IntRect enclosingIntRect(const CGRect&);

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -706 +706 @@
 void GraphicsLayerCA::setNeedsDisplay()
 {
-    FloatRect hugeRect(-std::numeric_limits<float>::max() / 2, -std::numeric_limits<float>::max() / 2,
-                       std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
-
-    setNeedsDisplayInRect(hugeRect);
+    setNeedsDisplayInRect(FloatRect::infiniteRect());
 }
 

trunk/Source/WebCore/rendering/PaintInfo.h

@@ -99 +99 @@
         context->concatCTM(localToAncestorTransform);
 
-        if (rect == infiniteRect())
+        if (rect.isInfinite())
             return;
 
@@ -105 +105 @@
     }
 #endif
-
-    static IntRect infiniteRect() { return IntRect(LayoutRect::infiniteRect()); }
 
     GraphicsContext* context;

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -1090 +1090 @@
         RenderRegion* region = *iter;
         LayerFragments fragments;
-        region->collectLayerFragments(fragments, layerBoundingBox, PaintInfo::infiniteRect());
+        region->collectLayerFragments(fragments, layerBoundingBox, IntRect::infiniteRect());
         for (size_t i = 0; i < fragments.size(); ++i) {
             const LayerFragment& fragment = fragments.at(i);

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4281 +4281 @@
     ClipRect foregroundRectInFlowThread;
     ClipRect outlineRectInFlowThread;
-    calculateRects(paginationClipRectsContext, PaintInfo::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,
+    calculateRects(paginationClipRectsContext, IntRect::infiniteRect(), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,
         outlineRectInFlowThread, &offsetWithinPaginatedLayer);
     
@@ -5347 +5347 @@
     if (!parent()) {
         // The root layer's clip rect is always infinite.
-        clipRects.reset(PaintInfo::infiniteRect());
+        clipRects.reset(IntRect::infiniteRect());
         return;
     }
@@ -5373 +5373 @@
         }
     } else
-        clipRects.reset(PaintInfo::infiniteRect());
+        clipRects.reset(IntRect::infiniteRect());
 
     // A fixed object is essentially the root of its containing block hierarchy, so when
@@ -5466 +5466 @@
 
     // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite.
-    if (parentRects.fixed() && &clipRectsContext.rootLayer->renderer() == &view && backgroundClipRect != PaintInfo::infiniteRect())
+    if (parentRects.fixed() && &clipRectsContext.rootLayer->renderer() == &view && backgroundClipRect != IntRect::infiniteRect())
         backgroundClipRect.move(view.frameView().scrollOffsetForFixedPosition());
 
@@ -5597 +5597 @@
     ClipRect backgroundRect, foregroundRect, outlineRect;
     ClipRectsContext clipRectsContext(clippingRootLayer, 0, PaintingClipRects);
-    calculateRects(clipRectsContext, PaintInfo::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
+    calculateRects(clipRectsContext, IntRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, outlineRect);
 
     LayoutRect clipRect = backgroundRect.rect();
-    if (clipRect == PaintInfo::infiniteRect())
+    if (clipRect == IntRect::infiniteRect())
         return clipRect;
 
@@ -5793 +5793 @@
     if (flags & UseLocalClipRectIfPossible) {
         LayoutRect localClipRect = this->localClipRect();
-        if (localClipRect != PaintInfo::infiniteRect()) {
+        if (localClipRect != IntRect::infiniteRect()) {
             if ((flags & IncludeSelfTransform) && paintsWithTransform(PaintBehaviorNormal))
                 localClipRect = transform()->mapRect(localClipRect);
@@ -6956 +6956 @@
 
     // Optimize clipping for the single fragment case.
-    if (!regionClipRect.isEmpty() && regionClipRect != PaintInfo::infiniteRect())
+    if (!regionClipRect.isEmpty() && regionClipRect != IntRect::infiniteRect())
         clipToRect(paintingInfo.rootLayer, context, paintingInfo.paintDirtyRect, regionClipRect);
 
     flowThreadLayer->paintNamedFlowThreadInsideRegion(context, region, paintingInfo.paintDirtyRect, paintOffset, paintingInfo.paintBehavior, paintFlags);
 
-    if (!regionClipRect.isEmpty() && regionClipRect != PaintInfo::infiniteRect())
+    if (!regionClipRect.isEmpty() && regionClipRect != IntRect::infiniteRect())
         restoreClip(context, paintingInfo.paintDirtyRect, regionClipRect);
 }

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -647 +647 @@
 static IntRect clipBox(RenderBox& renderer)
 {
-    LayoutRect result = PaintInfo::infiniteRect();
+    LayoutRect result = IntRect::infiniteRect();
     if (renderer.hasOverflowClip())
         result = renderer.overflowClipRect(LayoutPoint(), 0); // FIXME: Incorrect for CSS regions.
@@ -754 +754 @@
         RenderLayer::ClipRectsContext clipRectsContext(compAncestor, 0, TemporaryClipRects, IgnoreOverlayScrollbarSize, IgnoreOverflowClip);
         IntRect parentClipRect = pixelSnappedIntRect(m_owningLayer.backgroundClipRect(clipRectsContext).rect()); // FIXME: Incorrect for CSS regions.
-        ASSERT(parentClipRect != PaintInfo::infiniteRect());
+        ASSERT(parentClipRect != IntRect::infiniteRect());
         m_ancestorClippingLayer->setPosition(FloatPoint(parentClipRect.location() - graphicsLayerParentLocation));
         m_ancestorClippingLayer->setSize(parentClipRect.size());

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2196 +2196 @@
         return false;
 
-    return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != PaintInfo::infiniteRect(); // FIXME: Incorrect for CSS regions.
+    return layer.backgroundClipRect(RenderLayer::ClipRectsContext(computeClipRoot, 0, TemporaryClipRects)).rect() != IntRect::infiniteRect(); // FIXME: Incorrect for CSS regions.
 }
 

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp

@@ -276 +276 @@
     ASSERT(image->context());
 
-    PaintInfo info(image->context(), PaintInfo::infiniteRect(), PaintPhaseForeground, PaintBehaviorNormal);
+    PaintInfo info(image->context(), IntRect::infiniteRect(), PaintPhaseForeground, PaintBehaviorNormal);
 
     AffineTransform& contentTransformation = currentContentTransformation();