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

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

Issue 817603002: cc: Make scheduling be driven by vsync for android webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix misc bugs introduced in last two patches Created 5 years, 10 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
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 "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 void ScheduledActionBeginOutputSurfaceCreation() override { 112 void ScheduledActionBeginOutputSurfaceCreation() override {
113 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation(); 113 ThreadProxy::ScheduledActionBeginOutputSurfaceCreation();
114 test_hooks_->ScheduledActionBeginOutputSurfaceCreation(); 114 test_hooks_->ScheduledActionBeginOutputSurfaceCreation();
115 } 115 }
116 116
117 void ScheduledActionPrepareTiles() override { 117 void ScheduledActionPrepareTiles() override {
118 ThreadProxy::ScheduledActionPrepareTiles(); 118 ThreadProxy::ScheduledActionPrepareTiles();
119 test_hooks_->ScheduledActionPrepareTiles(); 119 test_hooks_->ScheduledActionPrepareTiles();
120 } 120 }
121 121
122 void ScheduledActionInvalidateOutputSurface() override {
123 ThreadProxy::ScheduledActionInvalidateOutputSurface();
124 test_hooks_->ScheduledActionInvalidateOutputSurface();
125 }
126
122 ThreadProxyForTest( 127 ThreadProxyForTest(
123 TestHooks* test_hooks, 128 TestHooks* test_hooks,
124 LayerTreeHost* host, 129 LayerTreeHost* host,
125 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 130 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
126 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner, 131 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
127 scoped_ptr<BeginFrameSource> external_begin_frame_source) 132 scoped_ptr<BeginFrameSource> external_begin_frame_source)
128 : ThreadProxy(host, main_task_runner, 133 : ThreadProxy(host, main_task_runner,
129 impl_task_runner, 134 impl_task_runner,
130 external_begin_frame_source.Pass()), 135 external_begin_frame_source.Pass()),
131 test_hooks_(test_hooks) {} 136 test_hooks_(test_hooks) {}
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 return -1; 877 return -1;
873 } 878 }
874 879
875 void LayerTreeTest::DestroyLayerTreeHost() { 880 void LayerTreeTest::DestroyLayerTreeHost() {
876 if (layer_tree_host_ && layer_tree_host_->root_layer()) 881 if (layer_tree_host_ && layer_tree_host_->root_layer())
877 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); 882 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
878 layer_tree_host_ = nullptr; 883 layer_tree_host_ = nullptr;
879 } 884 }
880 885
881 } // namespace cc 886 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698