diff options
| author | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 17:04:58 +0000 |
|---|---|---|
| committer | brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 17:04:58 +0000 |
| commit | 097a0cbf203baa9e9de663b7afee7734f6f40cc7 (patch) | |
| tree | c39b9b2cd2bea2d1218cf21ab7e86d58164649a1 /cc/test/layer_tree_test.cc | |
| parent | f146e9d973dc48af2a1d2bb615e0fb77e9279e16 (diff) | |
| download | chromium_src-097a0cbf203baa9e9de663b7afee7734f6f40cc7.zip chromium_src-097a0cbf203baa9e9de663b7afee7734f6f40cc7.tar.gz chromium_src-097a0cbf203baa9e9de663b7afee7734f6f40cc7.tar.bz2 | |
cc: Don't cancel poll_for_draw_triggers_closure_ too early.
Previously, the second poll event would always get canceled before
it has a chance to be run.
Existing tests have been modified to abort multiple commits in a
row. Although these don't fail without this patch, they are only
passing because of distant side-effects that happen to result
in a third poll event being scheduled.
BUG=327859
Review URL: https://codereview.chromium.org/102643009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_test.cc')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index b723c56..64c3e9a 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -84,6 +84,11 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { test_hooks_->DidBeginImplFrameOnThread(this, args); } + virtual void BeginMainFrameAborted(bool did_handle) OVERRIDE { + LayerTreeHostImpl::BeginMainFrameAborted(did_handle); + test_hooks_->BeginMainFrameAbortedOnThread(this, did_handle); + } + virtual void BeginCommit() OVERRIDE { LayerTreeHostImpl::BeginCommit(); test_hooks_->BeginCommitOnThread(this); |