Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / public / platform / WebLayer.h

diff --git a/src/third_party/WebKit/public/platform/WebLayer.h b/src/third_party/WebKit/public/platform/WebLayer.h
index 2ffb901..046b980 100644 (file)
--- a/src/third_party/WebKit/public/platform/WebLayer.h
+++ b/src/third_party/WebKit/public/platform/WebLayer.h
@@ -98,9 +98,6 @@ public:
     virtual void setPosition(const WebFloatPoint&) = 0;
     virtual WebFloatPoint position() const = 0;
 
-    virtual void setSublayerTransform(const SkMatrix44&) = 0;
-    virtual SkMatrix44 sublayerTransform() const = 0;
-
     virtual void setTransform(const SkMatrix44&) = 0;
     virtual SkMatrix44 transform() const = 0;
 
@@ -108,7 +105,13 @@ public:
     virtual void setDrawsContent(bool) = 0;
     virtual bool drawsContent() const = 0;
 
-    virtual void setPreserves3D(bool) = 0;
+    // Sets whether the layer's transform should be flattened.
+    virtual void setShouldFlattenTransform(bool) = 0;
+
+    // Sets the id of the layer's 3d rendering context. Layers in the same 3d
+    // rendering context id are sorted with one another according to their 3d
+    // position rather than their tree order.
+    virtual void setRenderingContext(int id) = 0;
 
     // Mark that this layer should use its parent's transform and double-sided
     // properties in determining this layer's backface visibility instead of
@@ -173,10 +176,8 @@ public:
     virtual WebSize maxScrollPosition() const = 0;
 
     // To set a WebLayer as scrollable we must specify the corresponding clip layer.
-    // TODO(wjmaclean) Make this pure virtual once https://codereview.chromium.org/23983047 lands.
-    virtual void setScrollClipLayer(WebLayer*) { }
+    virtual void setScrollClipLayer(WebLayer*) = 0;
     virtual bool scrollable() const = 0;
-
     virtual void setUserScrollable(bool horizontal, bool vertical) = 0;
     virtual bool userScrollableHorizontal() const = 0;
     virtual bool userScrollableVertical() const = 0;
@@ -216,10 +217,6 @@ public:
     virtual bool isOrphan() const = 0;
 
     virtual void setWebLayerClient(WebLayerClient*) = 0;
-
-    // TODO(wjmaclean) Remove next two lines once https://codereview.chromium.org/23983047 lands.
-    virtual void setMaxScrollPosition(WebSize) { }
-    virtual void setScrollable(bool) { }
 };
 
 } // namespace blink