diff options
| author | jbroman <jbroman@chromium.org> | 2016-03-01 14:51:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 22:53:33 +0000 |
| commit | 8b3ed673a5787b3cc14a2a8cc8de7380cb4c1d88 (patch) | |
| tree | 58cfac4754876cb7589b8f9d75983ecf40245cb1 /cc/blink | |
| parent | 95acbbaea5077dcd05ba8fce0451b71e7cbe8468 (diff) | |
| download | chromium_src-8b3ed673a5787b3cc14a2a8cc8de7380cb4c1d88.zip chromium_src-8b3ed673a5787b3cc14a2a8cc8de7380cb4c1d88.tar.gz chromium_src-8b3ed673a5787b3cc14a2a8cc8de7380cb4c1d88.tar.bz2 | |
[SPv2] Support composited plugins via foreign layers.
BUG=587970
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Committed: https://crrev.com/bf29b13a060e17f0e1cf96886ab1c798f7d54cc8
Cr-Commit-Position: refs/heads/master@{#378117}
Committed: https://crrev.com/c5a5aaba0445bf16820fdf0a5e0093f98e06dd23
Cr-Commit-Position: refs/heads/master@{#378148}
Review URL: https://codereview.chromium.org/1714153002
Cr-Commit-Position: refs/heads/master@{#378586}
Diffstat (limited to 'cc/blink')
| -rw-r--r-- | cc/blink/web_layer_impl.cc | 4 | ||||
| -rw-r--r-- | cc/blink/web_layer_impl.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index eed02ff..5c5dd2c 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -462,6 +462,10 @@ const cc::Layer* WebLayerImpl::ccLayer() const { return layer_.get(); } +cc::Layer* WebLayerImpl::ccLayer() { + return layer_.get(); +} + void WebLayerImpl::setElementId(uint64_t id) { layer_->SetElementId(id); } diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index 28da932..04fc7f1 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -147,6 +147,7 @@ class WebLayerImpl : public blink::WebLayer { void setScrollClient(blink::WebLayerScrollClient* client) override; void setLayerClient(cc::LayerClient* client) override; const cc::Layer* ccLayer() const override; + cc::Layer* ccLayer() override; void setElementId(uint64_t id) override; uint64_t elementId() const override; void setCompositorMutableProperties(uint32_t properties) override; |