diff options
| author | sohan.jyoti <sohan.jyoti@samsung.com> | 2015-01-06 09:28:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 17:29:28 +0000 |
| commit | c163943c9237231d8adbfe1f433d578e5ca23ced (patch) | |
| tree | 69453405d4ff62475cc38b749bc88ae465b5017b /cc | |
| parent | 5b35ed504ba27664bc0b7d7320f2ebdf610decdc (diff) | |
| download | chromium_src-c163943c9237231d8adbfe1f433d578e5ca23ced.zip chromium_src-c163943c9237231d8adbfe1f433d578e5ca23ced.tar.gz chromium_src-c163943c9237231d8adbfe1f433d578e5ca23ced.tar.bz2 | |
cc: Fix races in LTHDelegatedTest
Fixes data race in LTHDelegatedTestLayerUsesFrameDamage.
Reported by TSAN.
BUG=437454
Review URL: https://codereview.chromium.org/837493002
Cr-Commit-Position: refs/heads/master@{#310101}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/trees/layer_tree_host_unittest_delegated.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc index a504b2f..87f667c 100644 --- a/cc/trees/layer_tree_host_unittest_delegated.cc +++ b/cc/trees/layer_tree_host_unittest_delegated.cc @@ -470,10 +470,6 @@ SINGLE_AND_MULTI_THREAD_TEST_F( class LayerTreeHostDelegatedTestLayerUsesFrameDamage : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer { public: - LayerTreeHostDelegatedTestLayerUsesFrameDamage() - : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer(), - first_draw_for_source_frame_(true) {} - void DidCommit() override { int next_source_frame_number = layer_tree_host()->source_frame_number(); switch (next_source_frame_number) { @@ -581,7 +577,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage CreateFrameData(gfx::Rect(0, 0, 10, 10), gfx::Rect(3, 3, 1, 1))); break; } - first_draw_for_source_frame_ = true; } DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, @@ -589,9 +584,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage DrawResult draw_result) override { EXPECT_EQ(DRAW_SUCCESS, draw_result); - if (!first_draw_for_source_frame_) - return draw_result; - gfx::Rect damage_rect; if (!frame->has_no_damage) { damage_rect = frame->render_passes.back()->damage_rect; @@ -669,7 +661,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage protected: scoped_refptr<DelegatedRendererLayer> delegated_copy_; - bool first_draw_for_source_frame_; }; SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestLayerUsesFrameDamage); |