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

Unified Diff: cc/test/layer_tree_test.h

Issue 2155123003: cc: Fix use-after-frees for LayerTreeHostAnimationTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test-task-runner-gone: =nullptr Created 4 years, 5 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 | cc/test/layer_tree_test.cc » ('j') | cc/test/layer_tree_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 140cc7927bf9135796c0aa718f94d5d31738546f..3ecf38138eed2ce92e805df447a3c1e96a6ba2c7 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -128,11 +128,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
bool HasImplThread() const { return !!impl_thread_; }
base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
- DCHECK(task_runner_provider());
- base::SingleThreadTaskRunner* impl_thread_task_runner =
- task_runner_provider()->ImplThreadTaskRunner();
- return impl_thread_task_runner ? impl_thread_task_runner
- : main_task_runner_.get();
+ return impl_task_runner_.get();
}
base::SingleThreadTaskRunner* MainThreadTaskRunner() {
return main_task_runner_.get();
@@ -208,6 +204,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
int timeout_seconds_;
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
+ scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
std::unique_ptr<base::Thread> impl_thread_;
std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
std::unique_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
« no previous file with comments | « no previous file | cc/test/layer_tree_test.cc » ('j') | cc/test/layer_tree_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698