| Index: webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| index 4969077605d862dec49127fc7684750e36b25e19..6ab532df803293983cf8524c7e35c86c7c1ee947 100644
|
| --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc
|
| @@ -13,6 +13,7 @@
|
| #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #include "third_party/WebKit/public/platform/WebFloatRect.h"
|
| +#include "third_party/WebKit/public/platform/WebLayerClient.h"
|
| #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
|
| #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
|
| #include "third_party/WebKit/public/platform/WebSize.h"
|
| @@ -33,13 +34,20 @@ using WebKit::WebFilterOperations;
|
|
|
| namespace webkit {
|
|
|
| -WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {}
|
| +WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {
|
| + web_layer_client_ = NULL;
|
| + layer_->SetLayerClient(this);
|
| +}
|
|
|
| -WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {}
|
| +WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {
|
| + web_layer_client_ = NULL;
|
| + layer_->SetLayerClient(this);
|
| +}
|
|
|
| WebLayerImpl::~WebLayerImpl() {
|
| layer_->ClearRenderSurface();
|
| layer_->set_layer_animation_delegate(NULL);
|
| + web_layer_client_ = NULL;
|
| }
|
|
|
| int WebLayerImpl::id() const { return layer_->id(); }
|
| @@ -362,6 +370,19 @@ void WebLayerImpl::setScrollClient(
|
|
|
| bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); }
|
|
|
| +void WebLayerImpl::setWebLayerClient(WebKit::WebLayerClient* client) {
|
| + web_layer_client_ = client;
|
| +}
|
| +
|
| +std::string WebLayerImpl::DebugName() {
|
| + if (!web_layer_client_)
|
| + return std::string();
|
| +
|
| + std::string name = web_layer_client_->debugName(this).utf8();
|
| + DCHECK(IsStringASCII(name));
|
| + return name;
|
| +}
|
| +
|
| Layer* WebLayerImpl::layer() const { return layer_.get(); }
|
|
|
| } // namespace webkit
|
|
|