Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
index ed59cd9b1fa5d2f304eb149e7295945a23aa0012..b0f51330315f6045a184d620b6afa38e7ed8dd3e 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h |
@@ -27,6 +27,7 @@ |
#ifndef GraphicsLayer_h |
#define GraphicsLayer_h |
+#include "cc/layers/layer_client.h" |
#include "platform/PlatformExport.h" |
#include "platform/geometry/FloatPoint.h" |
#include "platform/geometry/FloatPoint3D.h" |
@@ -46,7 +47,6 @@ |
#include "public/platform/WebCompositorAnimationDelegate.h" |
#include "public/platform/WebContentLayer.h" |
#include "public/platform/WebImageLayer.h" |
-#include "public/platform/WebLayerClient.h" |
#include "public/platform/WebLayerScrollClient.h" |
#include "public/platform/WebScrollBlocksOn.h" |
#include "third_party/skia/include/core/SkPaint.h" |
@@ -74,7 +74,7 @@ typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector; |
// GraphicsLayer is an abstraction for a rendering surface with backing store, |
// which may have associated transformation and animations. |
-class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public WebLayerClient { |
+class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public WebCompositorAnimationDelegate, public WebLayerScrollClient, public cc::LayerClient { |
WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED(GraphicsLayer); |
public: |
static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*); |
@@ -83,9 +83,6 @@ public: |
GraphicsLayerClient* client() const { return m_client; } |
- // WebLayerClient implementation. |
- WebGraphicsLayerDebugInfo* takeDebugInfoFor(WebLayer*) override; |
- |
GraphicsLayerDebugInfo& debugInfo(); |
void setCompositingReasons(CompositingReasons); |
@@ -252,6 +249,9 @@ public: |
// WebLayerScrollClient implementation. |
void didScroll() override; |
+ // cc::LayerClient implementation. |
+ scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo(cc::Layer*) override; |
+ |
PaintController* paintController() override; |
// Exposed for tests. |
@@ -266,7 +266,7 @@ public: |
#endif |
protected: |
- String debugName(WebLayer*) const; |
+ String debugName(cc::Layer*) const; |
explicit GraphicsLayer(GraphicsLayerClient*); |
// GraphicsLayerFactoryChromium that wants to create a GraphicsLayer need to be friends. |