Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3879)

Unified Diff: cc/trees/layer_tree_host_unittest_delegated.cc

Issue 837493002: cc: Fix races in LTHDelegatedTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_delegated.cc
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index a504b2f60bbd62cec54cfa38857ca2c458f2c1fd..5267bbd956a7f88e6b74b750ae38b5b1e367ee78 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -471,8 +471,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
: public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
public:
LayerTreeHostDelegatedTestLayerUsesFrameDamage()
danakj 2015/01/05 19:45:14 nit: you can just remove this whole constructor i
sohanjg 2015/01/06 07:25:22 Done.
- : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer(),
- first_draw_for_source_frame_(true) {}
+ : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer() {}
void DidCommit() override {
int next_source_frame_number = layer_tree_host()->source_frame_number();
@@ -581,7 +580,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 +587,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
DrawResult draw_result) override {
EXPECT_EQ(DRAW_SUCCESS, draw_result);
- if (!first_draw_for_source_frame_)
- return draw_result;
-
sohanjg 2015/01/05 12:39:58 I think we can assume, PrepareToDraw will happen o
danakj 2015/01/05 19:45:14 Yes but this is trying to prevent multiple draws f
sohanjg 2015/01/06 07:25:22 Acknowledged.
gfx::Rect damage_rect;
if (!frame->has_no_damage) {
damage_rect = frame->render_passes.back()->damage_rect;
@@ -669,7 +664,6 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
protected:
scoped_refptr<DelegatedRendererLayer> delegated_copy_;
- bool first_draw_for_source_frame_;
};
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestLayerUsesFrameDamage);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698