diff options
author | qiankun.miao@intel.com <qiankun.miao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:41:24 +0000 |
---|---|---|
committer | qiankun.miao@intel.com <qiankun.miao@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:41:24 +0000 |
commit | 710bdf099ca15899846080c10036fce935a9bbbb (patch) | |
tree | 85cc6a29d53f55b29bb3e2ef7a16f08aac3201d4 /webkit/renderer | |
parent | 596de2eade61e91d93efe8414eadd44a5fae9e0a (diff) | |
download | chromium_src-710bdf099ca15899846080c10036fce935a9bbbb.zip chromium_src-710bdf099ca15899846080c10036fce935a9bbbb.tar.gz chromium_src-710bdf099ca15899846080c10036fce935a9bbbb.tar.bz2 |
Add an API to set client of WebLayer
This patch is generated for adding SetWebLayerClient() API in WebLayer.
The API should be implemented in chrome then add it in blink, otherwise
blink side patch cannot be landed due to the API is only a pure virtual
function in blink.
BUG=269258
Review URL: https://chromiumcodereview.appspot.com/22127003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/renderer')
-rw-r--r-- | webkit/renderer/compositor_bindings/web_layer_impl.cc | 4 | ||||
-rw-r--r-- | webkit/renderer/compositor_bindings/web_layer_impl.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc index 4969077..0545b3a 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc @@ -362,6 +362,10 @@ void WebLayerImpl::setScrollClient( bool WebLayerImpl::isOrphan() const { return !layer_->layer_tree_host(); } +void WebLayerImpl::setWebLayerClient(WebKit::WebLayerClient* client) { + web_layer_client_ = client; +} + Layer* WebLayerImpl::layer() const { return layer_.get(); } } // namespace webkit diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/webkit/renderer/compositor_bindings/web_layer_impl.h index b92b0bf..ee5997d 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_layer_impl.h @@ -27,6 +27,7 @@ class SkImageFilter; namespace WebKit { class WebFilterOperations; +class WebLayerClient; struct WebFloatRect; } @@ -117,9 +118,11 @@ 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); protected: scoped_refptr<cc::Layer> layer_; + WebKit::WebLayerClient* web_layer_client_; private: scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |