summaryrefslogtreecommitdiffstats
path: root/cc/layer_tree_host.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-16 21:12:40 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-16 21:12:40 +0000
commitfbf77513101f73a974ad475b2bc4e2a192e2a77a (patch)
treedcb4e85c8b9a3d0ee10c3841285a3dd3439aeacf /cc/layer_tree_host.cc
parent2f64f3557446132f80eae5046c57e53eedce1396 (diff)
downloadchromium_src-fbf77513101f73a974ad475b2bc4e2a192e2a77a.zip
chromium_src-fbf77513101f73a974ad475b2bc4e2a192e2a77a.tar.gz
chromium_src-fbf77513101f73a974ad475b2bc4e2a192e2a77a.tar.bz2
cc: Block the main thread for texture layers during impl-side painting
This patch adds an additional completion event to thread proxy. Right now, it checks for the lack of a pending tree after drawing (which is currently where tree activation is triggered). R=nduca@chromium.org BUG=164993 Review URL: https://chromiumcodereview.appspot.com/11710004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host.cc')
-rw-r--r--cc/layer_tree_host.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index b2f930a..5e56eb8 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -843,6 +843,13 @@ void LayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
setNeedsCommit();
}
+bool LayerTreeHost::blocksPendingCommit() const
+{
+ if (!m_rootLayer)
+ return false;
+ return m_rootLayer->blocksPendingCommitRecursive();
+}
+
void LayerTreeHost::animateLayers(base::TimeTicks time)
{
if (!m_settings.acceleratedAnimationEnabled || m_animationRegistrar->active_animation_controllers().empty())