From 1c9988c3a3f8c1f6d07c1b66c25bdc7a95a7cc4e Mon Sep 17 00:00:00 2001 From: nektar Date: Mon, 29 Feb 2016 13:43:35 -0800 Subject: Revert of [SPv2] Support composited plugins via foreign layers. (patchset #11 id:200001 of https://codereview.chromium.org/1714153002/ ) Reason for revert: webkit_unit_tests on Mac-10.9 Original issue's description: > [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} TBR=dcheng@chromium.org,enne@chromium.org,pdr@chromium.org,trchen@chromium.org,jbroman@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=587970 Review URL: https://codereview.chromium.org/1746873002 Cr-Commit-Position: refs/heads/master@{#378279} --- cc/blink/web_layer_impl.cc | 4 ---- cc/blink/web_layer_impl.h | 1 - 2 files changed, 5 deletions(-) (limited to 'cc/blink') diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index 5c5dd2c..eed02ff 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -462,10 +462,6 @@ 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 04fc7f1..28da932 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -147,7 +147,6 @@ 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; -- cgit v1.1