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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/test/layer_tree_test.cc

Issue 1419283002: cc: Split Proxy and TaskRunnerProvider for the LayerTreeHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing include in perf test. Created 5 years, 1 month 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
« cc/test/layer_tree_test.h ('K') | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host.h » ('j') | cc/trees/proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 7d968a32fe449009fff1734e631d060932603b18..13bb8172365003b8b6e84be284f5acca42cee0b1 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -118,15 +118,11 @@ class ThreadProxyForTest : public ThreadProxy {
static scoped_ptr<Proxy> Create(
TestHooks* test_hooks,
LayerTreeHost* host,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
+ TaskRunnerProvider* task_runner_provider,
scoped_ptr<BeginFrameSource> external_begin_frame_source) {
- return make_scoped_ptr(new ThreadProxyForTest(
- test_hooks,
- host,
- main_task_runner,
- impl_task_runner,
- external_begin_frame_source.Pass()));
+ return make_scoped_ptr(
+ new ThreadProxyForTest(test_hooks, host, task_runner_provider,
+ external_begin_frame_source.Pass()));
}
~ThreadProxyForTest() override {}
@@ -335,14 +331,12 @@ class ThreadProxyForTest : public ThreadProxy {
ThreadProxy::BeginMainFrame(begin_main_frame_state.Pass());
};
- ThreadProxyForTest(
- TestHooks* test_hooks,
- LayerTreeHost* host,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
- scoped_ptr<BeginFrameSource> external_begin_frame_source)
- : ThreadProxy(host, main_task_runner,
- impl_task_runner,
+ ThreadProxyForTest(TestHooks* test_hooks,
+ LayerTreeHost* host,
+ TaskRunnerProvider* task_runner_provider,
+ scoped_ptr<BeginFrameSource> external_begin_frame_source)
+ : ThreadProxy(host,
+ task_runner_provider,
external_begin_frame_source.Pass()),
test_hooks_(test_hooks) {}
};
@@ -354,10 +348,10 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
TestHooks* test_hooks,
LayerTreeHost* host,
LayerTreeHostSingleThreadClient* client,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+ TaskRunnerProvider* task_runner_provider,
scoped_ptr<BeginFrameSource> external_begin_frame_source) {
return make_scoped_ptr(new SingleThreadProxyForTest(
- test_hooks, host, client, main_task_runner,
+ test_hooks, host, client, task_runner_provider,
external_begin_frame_source.Pass()));
}
@@ -413,9 +407,11 @@ class SingleThreadProxyForTest : public SingleThreadProxy {
TestHooks* test_hooks,
LayerTreeHost* host,
LayerTreeHostSingleThreadClient* client,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+ TaskRunnerProvider* task_runner_provider,
scoped_ptr<BeginFrameSource> external_begin_frame_source)
- : SingleThreadProxy(host, client, main_task_runner,
+ : SingleThreadProxy(host,
+ client,
+ task_runner_provider,
external_begin_frame_source.Pass()),
test_hooks_(test_hooks) {}
};
@@ -427,14 +423,15 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
TestHooks* test_hooks,
const LayerTreeSettings& settings,
LayerTreeHostImplClient* host_impl_client,
- Proxy* proxy,
+ TaskRunnerProvider* task_runner_provider,
SharedBitmapManager* shared_bitmap_manager,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
TaskGraphRunner* task_graph_runner,
RenderingStatsInstrumentation* stats_instrumentation) {
return make_scoped_ptr(new LayerTreeHostImplForTesting(
- test_hooks, settings, host_impl_client, proxy, shared_bitmap_manager,
- gpu_memory_buffer_manager, task_graph_runner, stats_instrumentation));
+ test_hooks, settings, host_impl_client, task_runner_provider,
+ shared_bitmap_manager, gpu_memory_buffer_manager, task_graph_runner,
+ stats_instrumentation));
}
protected:
@@ -442,14 +439,14 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
TestHooks* test_hooks,
const LayerTreeSettings& settings,
LayerTreeHostImplClient* host_impl_client,
- Proxy* proxy,
+ TaskRunnerProvider* task_runner_provider,
SharedBitmapManager* shared_bitmap_manager,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
TaskGraphRunner* task_graph_runner,
RenderingStatsInstrumentation* stats_instrumentation)
: LayerTreeHostImpl(settings,
host_impl_client,
- proxy,
+ task_runner_provider,
stats_instrumentation,
shared_bitmap_manager,
gpu_memory_buffer_manager,
@@ -704,20 +701,21 @@ class LayerTreeHostForTesting : public LayerTreeHost {
scoped_ptr<LayerTreeHostForTesting> layer_tree_host(
new LayerTreeHostForTesting(test_hooks, &params));
if (impl_task_runner.get()) {
- layer_tree_host->InitializeForTesting(
- ThreadProxyForTest::Create(test_hooks,
- layer_tree_host.get(),
- main_task_runner,
- impl_task_runner,
- external_begin_frame_source.Pass()));
+ scoped_ptr<TaskRunnerProvider> task_runner_provider =
+ TaskRunnerProvider::Create(main_task_runner, impl_task_runner);
vmpstr 2015/11/10 21:59:34 Can you rework this a bit to highlight the differe
Khushal 2015/11/10 23:34:03 Done.
+ scoped_ptr<Proxy> proxy = ThreadProxyForTest::Create(
+ test_hooks, layer_tree_host.get(), task_runner_provider.get(),
+ external_begin_frame_source.Pass());
+ layer_tree_host->InitializeForTesting(task_runner_provider.Pass(),
+ proxy.Pass());
} else {
- layer_tree_host->InitializeForTesting(
- SingleThreadProxyForTest::Create(
- test_hooks,
- layer_tree_host.get(),
- client,
- main_task_runner,
- external_begin_frame_source.Pass()));
+ scoped_ptr<TaskRunnerProvider> task_runner_provider =
+ TaskRunnerProvider::Create(main_task_runner, nullptr);
+ scoped_ptr<Proxy> proxy = SingleThreadProxyForTest::Create(
+ test_hooks, layer_tree_host.get(), client, task_runner_provider.get(),
+ external_begin_frame_source.Pass());
+ layer_tree_host->InitializeForTesting(task_runner_provider.Pass(),
+ proxy.Pass());
}
return layer_tree_host.Pass();
}
@@ -725,7 +723,7 @@ class LayerTreeHostForTesting : public LayerTreeHost {
scoped_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl(
LayerTreeHostImplClient* host_impl_client) override {
return LayerTreeHostImplForTesting::Create(
- test_hooks_, settings(), host_impl_client, proxy(),
+ test_hooks_, settings(), host_impl_client, task_runner_provider(),
shared_bitmap_manager(), gpu_memory_buffer_manager(),
task_graph_runner(), rendering_stats_instrumentation());
}
@@ -985,7 +983,7 @@ void LayerTreeTest::RealEndTest() {
void LayerTreeTest::DispatchAddAnimation(Layer* layer_to_receive_animation,
double animation_duration) {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_to_receive_animation) {
AddOpacityTransitionToLayer(
@@ -996,7 +994,7 @@ void LayerTreeTest::DispatchAddAnimation(Layer* layer_to_receive_animation,
void LayerTreeTest::DispatchAddAnimationToPlayer(
AnimationPlayer* player_to_receive_animation,
double animation_duration) {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (player_to_receive_animation) {
AddOpacityTransitionToPlayer(player_to_receive_animation,
@@ -1005,55 +1003,55 @@ void LayerTreeTest::DispatchAddAnimationToPlayer(
}
void LayerTreeTest::DispatchSetDeferCommits(bool defer_commits) {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetDeferCommits(defer_commits);
}
void LayerTreeTest::DispatchSetNeedsCommit() {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetNeedsCommit();
}
void LayerTreeTest::DispatchSetNeedsUpdateLayers() {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetNeedsUpdateLayers();
}
void LayerTreeTest::DispatchSetNeedsRedraw() {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetNeedsRedraw();
}
void LayerTreeTest::DispatchSetNeedsRedrawRect(const gfx::Rect& damage_rect) {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetNeedsRedrawRect(damage_rect);
}
void LayerTreeTest::DispatchSetVisible(bool visible) {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetVisible(visible);
}
void LayerTreeTest::DispatchSetNextCommitForcesRedraw() {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->SetNextCommitForcesRedraw();
}
void LayerTreeTest::DispatchCompositeImmediately() {
- DCHECK(!proxy() || proxy()->IsMainThread());
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread());
if (layer_tree_host_)
layer_tree_host_->Composite(base::TimeTicks::Now());
}
@@ -1152,11 +1150,13 @@ void LayerTreeTest::DestroyLayerTreeHost() {
}
LayerTreeHost* LayerTreeTest::layer_tree_host() {
- // We check for a null proxy here as we sometimes ask for the layer tree host
- // when the proxy does not exist, often for checking settings after a test has
- // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See
- // elsewhere in this file for other examples.
- DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked());
+ // We check for a null task_runner_provider here as we sometimes ask for the
+ // layer tree host when the task_runner_provider does not exist, often for
+ // checking settings after a test has completed. For example,
+ // LTHPixelResourceTest::RunPixelResourceTest. See elsewhere in this file for
+ // other examples.
+ DCHECK(!task_runner_provider() || task_runner_provider()->IsMainThread() ||
+ task_runner_provider()->IsMainThreadBlocked());
return layer_tree_host_.get();
}
« cc/test/layer_tree_test.h ('K') | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host.h » ('j') | cc/trees/proxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698