Index: cc/thread_proxy.cc |
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc |
index b4c6a079d841126debc19fab76e563ecf09e86c1..1ee6e8636981639ec28f5106385a031b1f6e720e 100644 |
--- a/cc/thread_proxy.cc |
+++ b/cc/thread_proxy.cc |
@@ -411,7 +411,8 @@ void ThreadProxy::setNeedsRedraw() |
DCHECK(isMainThread()); |
TRACE_EVENT0("cc", "ThreadProxy::setNeedsRedraw"); |
Proxy::implThread()->postTask(base::Bind(&ThreadProxy::setFullRootLayerDamageOnImplThread, m_implThreadWeakPtr)); |
- Proxy::implThread()->postTask(base::Bind(&ThreadProxy::setNeedsRedrawOnImplThread, m_implThreadWeakPtr)); |
+ if (!m_layerTreeHost->settings().implSidePainting) |
enne (OOO)
2013/01/10 03:45:31
I understand moving the conditional in the commit
nduca
2013/01/10 11:01:09
yeah this makes no sense to me
brianderson
2013/01/10 18:55:32
Ah, I saw this being called after a commit and ass
|
+ Proxy::implThread()->postTask(base::Bind(&ThreadProxy::setNeedsRedrawOnImplThread, m_implThreadWeakPtr)); |
} |
void ThreadProxy::setDeferCommits(bool deferCommits) |
@@ -732,6 +733,10 @@ void ThreadProxy::scheduledActionCommit() |
// SetVisible kicks off the next scheduler action, so this must be last. |
m_schedulerOnImplThread->setVisible(m_layerTreeHostImpl->visible()); |
+ |
nduca
2013/01/10 11:01:09
I dislike this.
I'd rather this was all in the st
brianderson
2013/01/10 18:55:32
I had moved it out here because all the other setN
|
+ // This will also kick off the a scheduler action. |
enne (OOO)
2013/01/10 03:45:31
Can you reconcile this with the previous comment t
|
+ if (!m_layerTreeHost->settings().implSidePainting) |
+ m_schedulerOnImplThread->setNeedsRedraw(); |
enne (OOO)
2013/01/10 03:45:31
I feel like removing the redraw here needs to corr
brianderson
2013/01/10 18:55:32
This is meant to go on top of my other patch, whic
|
} |
void ThreadProxy::scheduledActionBeginContextRecreation() |