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

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

Issue 10694117: Merge 121450 - [chromium] Should schedule a commit when dropping contents textures (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 | « no previous file | Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (revision 122259)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (working copy)
@@ -156,6 +156,7 @@
void CCLayerTreeHostImpl::commitComplete()
{
+ TRACE_EVENT0("cc", "CCLayerTreeHostImpl::commitComplete");
// Recompute max scroll position; must be after layer content bounds are
// updated.
updateMaxScrollPosition();
@@ -164,14 +165,22 @@
bool CCLayerTreeHostImpl::canDraw()
{
- if (!m_rootLayerImpl)
+ if (!m_rootLayerImpl) {
+ TRACE_EVENT_INSTANT0("cc", "CCLayerTreeHostImpl::canDraw no root layer");
return false;
- if (viewportSize().isEmpty())
+ }
+ if (viewportSize().isEmpty()) {
+ TRACE_EVENT_INSTANT0("cc", "CCLayerTreeHostImpl::canDraw empty viewport");
return false;
- if (!m_layerRenderer)
+ }
+ if (!m_layerRenderer) {
+ TRACE_EVENT_INSTANT0("cc", "CCLayerTreeHostImpl::canDraw no layerRenderer");
return false;
- if (m_contentsTexturesWerePurgedSinceLastCommit)
+ }
+ if (m_contentsTexturesWerePurgedSinceLastCommit) {
+ TRACE_EVENT_INSTANT0("cc", "CCLayerTreeHostImpl::canDraw contents textures purged");
return false;
+ }
return true;
}
@@ -409,6 +418,7 @@
{
contentsTextureAllocator()->deleteAllTextures();
m_contentsTexturesWerePurgedSinceLastCommit = true;
+ m_client->setNeedsCommitOnImplThread();
}
void CCLayerTreeHostImpl::setMemoryAllocationLimitBytes(size_t bytes)
« no previous file with comments | « no previous file | Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698