diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 06:13:53 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 06:13:53 +0000 |
| commit | b774a889c9702468729ec2fbe6a4206e20181ef4 (patch) | |
| tree | 3af7f35898af1ea6bdf439eecac32b3d09476cb6 /webkit | |
| parent | 227dbe34b4dfab240cd2a60cc3f5c02365b94b72 (diff) | |
| download | chromium_src-b774a889c9702468729ec2fbe6a4206e20181ef4.zip chromium_src-b774a889c9702468729ec2fbe6a4206e20181ef4.tar.gz chromium_src-b774a889c9702468729ec2fbe6a4206e20181ef4.tar.bz2 | |
Revert 176271
> Make RenderWidget responsible for the composited view's lifetime
>
> Chromium side of https://bugs.webkit.org/show_bug.cgi?id=105071.
> content::RenderWidget constructs a WebLayerTreeView when WebKit
> asks it and then retains ownership. This has to be destroyed
> before the WebWidget is closed since the WLTVClient is (currently)
> a WebKit object.
>
> BUG=156175
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175303
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175827
>
> Review URL: https://codereview.chromium.org/11575049
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/11852009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index 44884c1c..e42a3c7 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -57,11 +57,6 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti return true; } -cc::LayerTreeHost* WebLayerTreeViewImpl::layer_tree_host() const -{ - return m_layerTreeHost.get(); -} - void WebLayerTreeViewImpl::setSurfaceReady() { m_layerTreeHost->setSurfaceReady(); diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h index c69ccbe..4817221 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h @@ -30,8 +30,6 @@ public: WEBKIT_COMPOSITOR_BINDINGS_EXPORT bool initialize( const Settings&, scoped_ptr<cc::Thread> implThread); - WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const; - // WebLayerTreeView implementation. virtual void setSurfaceReady() OVERRIDE; virtual void setRootLayer(const WebLayer&) OVERRIDE; |