Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Unified Diff: webkit/renderer/compositor_bindings/web_layer_impl.h

Issue 16903005: Add layer name into frame viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase code Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/compositor_bindings/web_layer_impl.h
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/webkit/renderer/compositor_bindings/web_layer_impl.h
index b92b0bfc08401c587e6d73a1be214b2c4941431e..b032e6ff635ccfaf09b9358d74e02c331efb2847 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.h
+++ b/webkit/renderer/compositor_bindings/web_layer_impl.h
@@ -5,9 +5,13 @@
#ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
+#include <string>
+
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "cc/layers/layer.h"
#include "third_party/WebKit/public/platform/WebAnimation.h"
+#include "third_party/WebKit/public/platform/WebCString.h"
#include "third_party/WebKit/public/platform/WebColor.h"
#include "third_party/WebKit/public/platform/WebCompositingReasons.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ -20,7 +24,10 @@
#include "third_party/skia/include/utils/SkMatrix44.h"
#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
-namespace cc { class Layer; }
+namespace cc {
+class Layer;
+class LayerClient;
+}
// TODO(senorblanco): Remove this once WebKit changes have landed.
class SkImageFilter;
@@ -34,7 +41,7 @@ namespace webkit {
class WebToCCAnimationDelegateAdapter;
-class WebLayerImpl : public WebKit::WebLayer {
+class WebLayerImpl : public WebKit::WebLayer, public cc::LayerClient {
public:
WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl();
WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(
@@ -117,9 +124,14 @@ class WebLayerImpl : public WebKit::WebLayer {
virtual WebKit::WebLayerPositionConstraint positionConstraint() const;
virtual void setScrollClient(WebKit::WebLayerScrollClient* client);
virtual bool isOrphan() const;
+ virtual void setWebLayerClient(WebKit::WebLayerClient* client);
+
+ // LayerClient implementation.
+ virtual std::string DebugName() OVERRIDE;
protected:
scoped_refptr<cc::Layer> layer_;
+ WebKit::WebLayerClient* web_layer_client_;
private:
scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_;

Powered by Google App Engine
This is Rietveld 408576698