summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 21:30:10 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-16 21:30:10 +0000
commitaed3703d1355f2c70ea5521d23faf96f65f58534 (patch)
tree118a84b10ed2e374c700e8b83b0eb3a1ff26b019 /cc
parenta84cd887ba2be0494ffc559d7b7d68381fb3dd7d (diff)
downloadchromium_src-aed3703d1355f2c70ea5521d23faf96f65f58534.zip
chromium_src-aed3703d1355f2c70ea5521d23faf96f65f58534.tar.gz
chromium_src-aed3703d1355f2c70ea5521d23faf96f65f58534.tar.bz2
Do SetNeedsCommit() instead of Composite() in threaded mode.
R=enne@chromium.org, piman@chromium.org, enne, piman BUG=374287 Review URL: https://codereview.chromium.org/290563005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/trees/layer_tree_host.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index dfe4658..c83a68e 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -696,11 +696,9 @@ void LayerTreeHost::NotifyInputThrottledUntilCommit() {
}
void LayerTreeHost::Composite(base::TimeTicks frame_begin_time) {
- if (!proxy_->HasImplThread())
- static_cast<SingleThreadProxy*>(proxy_.get())->CompositeImmediately(
- frame_begin_time);
- else
- SetNeedsCommit();
+ DCHECK(!proxy_->HasImplThread());
+ SingleThreadProxy* proxy = static_cast<SingleThreadProxy*>(proxy_.get());
+ proxy->CompositeImmediately(frame_begin_time);
}
bool LayerTreeHost::InitializeOutputSurfaceIfNeeded() {