diff options
| author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 15:20:17 +0000 |
|---|---|---|
| committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 15:20:17 +0000 |
| commit | 03261d47d73ef8e137e9300000d22c2fee9939f9 (patch) | |
| tree | 0e81262b6193797ab2a7a35058b0f18feb5d19f0 /cc | |
| parent | bf22716dd04900b32446f6d519b7f5dda612a452 (diff) | |
| download | chromium_src-03261d47d73ef8e137e9300000d22c2fee9939f9.zip chromium_src-03261d47d73ef8e137e9300000d22c2fee9939f9.tar.gz chromium_src-03261d47d73ef8e137e9300000d22c2fee9939f9.tar.bz2 | |
Fix GetSnapshotFromRenderer stalling when capturing while between navigating to certain pages.
BUG=271056
Review URL: https://chromiumcodereview.appspot.com/22763003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/trees/thread_proxy.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc index 5705788..a0bd4bf 100644 --- a/cc/trees/thread_proxy.cc +++ b/cc/trees/thread_proxy.cc @@ -112,7 +112,11 @@ bool ThreadProxy::CompositeAndReadback(void* pixels, gfx::Rect rect) { TRACE_EVENT0("cc", "ThreadProxy::CompositeAndReadback"); DCHECK(IsMainThread()); DCHECK(layer_tree_host_); - DCHECK(!defer_commits_); + + if (defer_commits_) { + TRACE_EVENT0("cc", "CompositeAndReadback_DeferCommit"); + return false; + } if (!layer_tree_host_->InitializeOutputSurfaceIfNeeded()) { TRACE_EVENT0("cc", "CompositeAndReadback_EarlyOut_LR_Uninitialized"); |