Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1472)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 362403003: Prevent spinning up a layer tree view after closing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index a79c698484072414f1953b3cd1c6778c9d08d245..b36babbc47442d6a4d7e72058fd991f8edd02107 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -386,6 +386,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
, m_isAcceleratedCompositingActive(false)
, m_layerTreeViewCommitsDeferred(false)
+ , m_layerTreeViewClosed(false)
, m_matchesHeuristicsForGpuRasterization(false)
, m_recreatingGraphicsContext(false)
, m_flingModifier(0)
@@ -2434,6 +2435,7 @@ void WebViewImpl::willCloseLayerTreeView()
{
setIsAcceleratedCompositingActive(false);
m_layerTreeView = 0;
+ m_layerTreeViewClosed = true;
}
void WebViewImpl::didAcquirePointerLock()
@@ -3907,6 +3909,10 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
if (!m_client)
return;
+ // In the middle of shutting down; don't try to spin back up a compositor.
+ if (m_layerTreeViewClosed)
+ return;
+
if (!active) {
m_isAcceleratedCompositingActive = false;
if (!m_layerTreeViewCommitsDeferred
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698