Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 13 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.h b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
index a0a690f..5c7e2b1 100644
--- a/Source/WebCore/platform/graphics/chromium/LayerChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
@@ -112,6 +112,9 @@ public:
     void setName(const String& name) { m_name = name; }
     String name() const { return m_name; }
 
+    void setMaskLayer(LayerChromium* maskLayer) { m_maskLayer = maskLayer; }
+    LayerChromium* maskLayer() const { return m_maskLayer.get(); }
+
     void setNeedsDisplay(const FloatRect& dirtyRect);
     void setNeedsDisplay();
     const FloatRect& dirtyRect() const { return m_dirtyRect; }
@@ -152,12 +155,17 @@ public:
 
     void setOwner(GraphicsLayerChromium* owner) { m_owner = owner; }
 
+    void setReplicaLayer(LayerChromium* layer) { m_replicaLayer = layer; }
+    LayerChromium* replicaLayer() { return m_replicaLayer; }
+
     // Returns the rect containtaining this layer in the current view's coordinate system.
     const IntRect getDrawRect() const;
 
     // These methods typically need to be overwritten by derived classes.
     virtual bool drawsContent() { return false; }
     virtual void updateContentsIfDirty() { }
+    virtual void unreserveContentsTexture() { }
+    virtual void bindContentsTexture() { }
     virtual void draw() { }
 
     void drawDebugBorder();
@@ -222,6 +230,8 @@ protected:
     FloatRect m_dirtyRect;
     bool m_contentsDirty;
 
+    RefPtr<LayerChromium> m_maskLayer;
+
     // Render surface this layer draws into. This is a surface that can belong
     // either to this layer (if m_targetRenderSurface == m_renderSurface) or
     // to an ancestor of this layer. The target render surface determines the
@@ -298,6 +308,9 @@ private:
     // Hierarchical bounding rect containing the layer and its descendants.
     IntRect m_drawableContentRect;
 
+    // Replica layer used for reflections.
+    LayerChromium* m_replicaLayer;
+
     String m_name;
 };