Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderLayerClipper.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderLayerClipper.h b/src/third_party/WebKit/Source/core/rendering/RenderLayerClipper.h
index ba04211..3620979 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderLayerClipper.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderLayerClipper.h
@@ -67,11 +67,12 @@ struct ClipRectsContext {
     LayoutSize subPixelAccumulation;
 };
 
-class RenderLayerClipper {
+class RenderLayerClipper FINAL {
     WTF_MAKE_NONCOPYABLE(RenderLayerClipper);
 public:
-    RenderLayerClipper(RenderLayerModelObject* renderer)
-    : m_renderer(renderer)
+    explicit RenderLayerClipper(RenderLayerModelObject& renderer)
+        : m_renderer(renderer)
+        , m_compositingClipRectsDirty(false)
     {
     }
 
@@ -87,8 +88,9 @@ public:
     void clearClipRectsIncludingDescendants(ClipRectsType typeToClear = AllClipRectTypes);
     void clearClipRects(ClipRectsType typeToClear = AllClipRectTypes);
 
+    void setCompositingClipRectsDirty();
+
     LayoutRect childrenClipRect() const; // Returns the foreground clip rect of the layer in the document's coordinate space.
-    LayoutRect selfClipRect() const; // Returns the background clip rect of the layer in the document's coordinate space.
     LayoutRect localClipRect() const; // Returns the background clip rect of the layer in the local coordinate space.
 
     ClipRect backgroundClipRect(const ClipRectsContext&) const;
@@ -112,10 +114,12 @@ private:
     // The layer relative to which clipping rects for this layer are computed.
     RenderLayer* clippingRootForPainting() const;
 
-    // FIXME: Could this be a RenderBox?
-    RenderLayerModelObject* m_renderer;
+    bool isClippingRootForContext(const ClipRectsContext&) const;
 
+    // FIXME: Could this be a RenderBox?
+    RenderLayerModelObject& m_renderer;
     OwnPtr<ClipRectsCache> m_clipRectsCache;
+    unsigned m_compositingClipRectsDirty : 1;
 };
 
 } // namespace WebCore