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

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 2317493003: cc: Toward merging DrawFrame and SwapBuffers in DelegatingRenderer. (Closed)
Patch Set: merge-draw-swap: add-draw-result-checks Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « cc/output/delegating_renderer_unittest.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 test_hooks_->WillPrepareTilesOnThread(this); 176 test_hooks_->WillPrepareTilesOnThread(this);
177 return LayerTreeHostImpl::PrepareTiles(); 177 return LayerTreeHostImpl::PrepareTiles();
178 } 178 }
179 179
180 DrawResult PrepareToDraw(FrameData* frame) override { 180 DrawResult PrepareToDraw(FrameData* frame) override {
181 test_hooks_->WillPrepareToDrawOnThread(this); 181 test_hooks_->WillPrepareToDrawOnThread(this);
182 DrawResult draw_result = LayerTreeHostImpl::PrepareToDraw(frame); 182 DrawResult draw_result = LayerTreeHostImpl::PrepareToDraw(frame);
183 return test_hooks_->PrepareToDrawOnThread(this, frame, draw_result); 183 return test_hooks_->PrepareToDrawOnThread(this, frame, draw_result);
184 } 184 }
185 185
186 void DrawLayers(FrameData* frame) override { 186 bool SwapBuffers(const FrameData& frame) override {
187 LayerTreeHostImpl::DrawLayers(frame); 187 bool r = LayerTreeHostImpl::SwapBuffers(frame);
188 test_hooks_->DrawLayersOnThread(this); 188 test_hooks_->DrawLayersOnThread(this);
189 return r;
189 } 190 }
190 191
191 void NotifyReadyToActivate() override { 192 void NotifyReadyToActivate() override {
192 if (block_notify_ready_to_activate_for_testing_) { 193 if (block_notify_ready_to_activate_for_testing_) {
193 notify_ready_to_activate_was_blocked_ = true; 194 notify_ready_to_activate_was_blocked_ = true;
194 } else { 195 } else {
195 LayerTreeHostImpl::NotifyReadyToActivate(); 196 LayerTreeHostImpl::NotifyReadyToActivate();
196 test_hooks_->NotifyReadyToActivateOnThread(this); 197 test_hooks_->NotifyReadyToActivateOnThread(this);
197 } 198 }
198 } 199 }
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 } 939 }
939 940
940 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { 941 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
941 DCHECK(IsRemoteTest()); 942 DCHECK(IsRemoteTest());
942 DCHECK(task_runner_provider()->IsMainThread() || 943 DCHECK(task_runner_provider()->IsMainThread() ||
943 task_runner_provider()->IsMainThreadBlocked()); 944 task_runner_provider()->IsMainThreadBlocked());
944 return remote_client_layer_tree_host_.get(); 945 return remote_client_layer_tree_host_.get();
945 } 946 }
946 947
947 } // namespace cc 948 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/delegating_renderer_unittest.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698