Chromium Code Reviews

Side by Side Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/layers/layer_impl.h" 9 #include "cc/layers/layer_impl.h"
10 #include "cc/layers/picture_layer.h" 10 #include "cc/layers/picture_layer.h"
11 #include "cc/scheduler/begin_frame_source.h"
11 #include "cc/test/fake_content_layer_client.h" 12 #include "cc/test/fake_content_layer_client.h"
12 #include "cc/test/fake_layer_tree_host_client.h" 13 #include "cc/test/fake_layer_tree_host_client.h"
13 #include "cc/test/fake_picture_layer.h" 14 #include "cc/test/fake_picture_layer.h"
14 #include "cc/test/fake_picture_layer_impl.h" 15 #include "cc/test/fake_picture_layer_impl.h"
15 #include "cc/test/geometry_test_utils.h" 16 #include "cc/test/geometry_test_utils.h"
16 #include "cc/test/layer_tree_test.h" 17 #include "cc/test/layer_tree_test.h"
17 #include "cc/test/test_shared_bitmap_manager.h" 18 #include "cc/test/test_shared_bitmap_manager.h"
18 #include "cc/trees/layer_tree_impl.h" 19 #include "cc/trees/layer_tree_impl.h"
19 #include "ui/gfx/point_conversions.h" 20 #include "ui/gfx/point_conversions.h"
20 #include "ui/gfx/size_conversions.h" 21 #include "ui/gfx/size_conversions.h"
(...skipping 1101 matching lines...)
1122 1123
1123 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); 1124 ASSERT_TRUE(impl_thread.message_loop_proxy().get());
1124 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 1125 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
1125 new TestSharedBitmapManager()); 1126 new TestSharedBitmapManager());
1126 scoped_ptr<LayerTreeHost> layer_tree_host = 1127 scoped_ptr<LayerTreeHost> layer_tree_host =
1127 LayerTreeHost::CreateThreaded(&client, 1128 LayerTreeHost::CreateThreaded(&client,
1128 shared_bitmap_manager.get(), 1129 shared_bitmap_manager.get(),
1129 NULL, 1130 NULL,
1130 settings, 1131 settings,
1131 base::MessageLoopProxy::current(), 1132 base::MessageLoopProxy::current(),
1132 impl_thread.message_loop_proxy()); 1133 impl_thread.message_loop_proxy(),
1134 nullptr);
1133 1135
1134 impl_thread.message_loop_proxy() 1136 impl_thread.message_loop_proxy()
1135 ->PostTask(FROM_HERE, 1137 ->PostTask(FROM_HERE,
1136 base::Bind(&BindInputHandlerOnCompositorThread, 1138 base::Bind(&BindInputHandlerOnCompositorThread,
1137 layer_tree_host->GetInputHandler(), 1139 layer_tree_host->GetInputHandler(),
1138 base::Unretained(&input_handler_client))); 1140 base::Unretained(&input_handler_client)));
1139 1141
1140 layer_tree_host->DidStopFlinging(); 1142 layer_tree_host->DidStopFlinging();
1141 layer_tree_host = nullptr; 1143 layer_tree_host = nullptr;
1142 impl_thread.Stop(); 1144 impl_thread.Stop();
(...skipping 87 matching lines...)
1230 RunTest(true, false, true); 1232 RunTest(true, false, true);
1231 } 1233 }
1232 1234
1233 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { 1235 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
1234 scroll_destroy_whole_tree_ = true; 1236 scroll_destroy_whole_tree_ = true;
1235 RunTest(true, false, true); 1237 RunTest(true, false, true);
1236 } 1238 }
1237 1239
1238 } // namespace 1240 } // namespace
1239 } // namespace cc 1241 } // namespace cc
OLDNEW

Powered by Google App Engine