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

Unified Diff: cc/thread_proxy.cc

Issue 11311017: Verify that contentsTextureManager is non-NULL before dereferencing it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « cc/single_thread_proxy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/thread_proxy.cc
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index 666c03f7ca5072eb76d75d7eb41d71e46a91a612..418b1c75c0a9b490fa0380c33499d2a6b9c366bf 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -371,11 +371,17 @@ bool ThreadProxy::reduceContentsTextureMemoryOnImplThread(size_t limitBytes, int
void ThreadProxy::sendManagedMemoryStats()
{
DCHECK(isImplThread());
- if (m_layerTreeHostImpl.get() && m_layerTreeHostImpl->renderer())
- m_layerTreeHostImpl->renderer()->sendManagedMemoryStats(
- m_layerTreeHost->contentsTextureManager()->memoryVisibleBytes(),
- m_layerTreeHost->contentsTextureManager()->memoryVisibleAndNearbyBytes(),
- m_layerTreeHost->contentsTextureManager()->memoryUseBytes());
+ if (!m_layerTreeHostImpl.get())
+ return;
+ if (!m_layerTreeHostImpl->renderer())
+ return;
+ if (!m_layerTreeHost->contentsTextureManager())
+ return;
+
+ m_layerTreeHostImpl->renderer()->sendManagedMemoryStats(
+ m_layerTreeHost->contentsTextureManager()->memoryVisibleBytes(),
+ m_layerTreeHost->contentsTextureManager()->memoryVisibleAndNearbyBytes(),
+ m_layerTreeHost->contentsTextureManager()->memoryUseBytes());
}
void ThreadProxy::setNeedsRedraw()
« no previous file with comments | « cc/single_thread_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698