diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 05:41:51 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 05:41:51 +0000 |
| commit | 85275a5eebd908be2511cd44bd552c2e80b75e54 (patch) | |
| tree | 359a6d8fffb55465154b211905cb777a9f745b53 /webkit | |
| parent | d4655fad62730ab2532d31132430bb95dbb0ef6c (diff) | |
| download | chromium_src-85275a5eebd908be2511cd44bd552c2e80b75e54.zip chromium_src-85275a5eebd908be2511cd44bd552c2e80b75e54.tar.gz chromium_src-85275a5eebd908be2511cd44bd552c2e80b75e54.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176271 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, 7 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index e42a3c7..44884c1c 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -57,6 +57,11 @@ 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 4817221..c69ccbe 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h @@ -30,6 +30,8 @@ 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; |