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

Side by Side Diff: cc/surfaces/surface_display_output_surface_unittest.cc

Issue 1201573002: cc: Remove BeginFrameSourcesConstructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/surfaces/surface_display_output_surface.h" 5 #include "cc/surfaces/surface_display_output_surface.h"
6 6
7 #include "cc/surfaces/onscreen_display_client.h" 7 #include "cc/surfaces/onscreen_display_client.h"
8 #include "cc/surfaces/surface_id_allocator.h" 8 #include "cc/surfaces/surface_id_allocator.h"
9 #include "cc/surfaces/surface_manager.h" 9 #include "cc/surfaces/surface_manager.h"
10 #include "cc/test/fake_output_surface.h" 10 #include "cc/test/fake_output_surface.h"
11 #include "cc/test/fake_output_surface_client.h" 11 #include "cc/test/fake_output_surface_client.h"
12 #include "cc/test/ordered_simple_task_runner.h" 12 #include "cc/test/ordered_simple_task_runner.h"
13 #include "cc/test/test_context_provider.h" 13 #include "cc/test/test_context_provider.h"
14 #include "cc/test/test_gpu_memory_buffer_manager.h" 14 #include "cc/test/test_gpu_memory_buffer_manager.h"
15 #include "cc/test/test_shared_bitmap_manager.h" 15 #include "cc/test/test_shared_bitmap_manager.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace cc { 18 namespace cc {
19 namespace { 19 namespace {
20 20
21 class FakeOnscreenDisplayClient : public OnscreenDisplayClient { 21 class FakeOnscreenDisplayClient : public OnscreenDisplayClient {
22 public: 22 public:
23 FakeOnscreenDisplayClient( 23 FakeOnscreenDisplayClient(
24 SurfaceManager* manager, 24 SurfaceManager* manager,
25 SharedBitmapManager* bitmap_manager, 25 SharedBitmapManager* bitmap_manager,
26 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 26 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
27 const RendererSettings& settings, 27 const RendererSettings& settings,
28 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 28 base::SingleThreadTaskRunner* task_runner)
29 : OnscreenDisplayClient(FakeOutputSurface::Create3d(), 29 : OnscreenDisplayClient(FakeOutputSurface::Create3d(),
30 manager, 30 manager,
31 bitmap_manager, 31 bitmap_manager,
32 gpu_memory_buffer_manager, 32 gpu_memory_buffer_manager,
33 settings, 33 settings,
34 task_runner) { 34 task_runner) {
35 // Ownership is passed to another object later, store a pointer 35 // Ownership is passed to another object later, store a pointer
36 // to it now for future reference. 36 // to it now for future reference.
37 fake_output_surface_ = 37 fake_output_surface_ =
38 static_cast<FakeOutputSurface*>(output_surface_.get()); 38 static_cast<FakeOutputSurface*>(output_surface_.get());
(...skipping 10 matching lines...) Expand all
49 SurfaceDisplayOutputSurfaceTest() 49 SurfaceDisplayOutputSurfaceTest()
50 : now_src_(new base::SimpleTestTickClock()), 50 : now_src_(new base::SimpleTestTickClock()),
51 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)), 51 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
52 allocator_(0), 52 allocator_(0),
53 display_size_(1920, 1080), 53 display_size_(1920, 1080),
54 display_rect_(display_size_), 54 display_rect_(display_size_),
55 display_client_(&surface_manager_, 55 display_client_(&surface_manager_,
56 &bitmap_manager_, 56 &bitmap_manager_,
57 &gpu_memory_buffer_manager_, 57 &gpu_memory_buffer_manager_,
58 renderer_settings_, 58 renderer_settings_,
59 task_runner_), 59 task_runner_.get()),
60 context_provider_(TestContextProvider::Create()), 60 context_provider_(TestContextProvider::Create()),
61 surface_display_output_surface_(&surface_manager_, 61 surface_display_output_surface_(&surface_manager_,
62 &allocator_, 62 &allocator_,
63 context_provider_) { 63 context_provider_) {
64 output_surface_ = display_client_.output_surface(); 64 output_surface_ = display_client_.output_surface();
65 display_client_.set_surface_output_surface( 65 display_client_.set_surface_output_surface(
66 &surface_display_output_surface_); 66 &surface_display_output_surface_);
67 surface_display_output_surface_.set_display_client(&display_client_); 67 surface_display_output_surface_.set_display_client(&display_client_);
68 surface_display_output_surface_.BindToClient( 68 surface_display_output_surface_.BindToClient(
69 &surface_display_output_surface_client_); 69 &surface_display_output_surface_client_);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 140 EXPECT_EQ(1u, output_surface_->num_sent_frames());
141 141
142 SwapBuffersWithDamage(gfx::Rect()); 142 SwapBuffersWithDamage(gfx::Rect());
143 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 143 EXPECT_EQ(1u, output_surface_->num_sent_frames());
144 task_runner_->RunUntilIdle(); 144 task_runner_->RunUntilIdle();
145 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 145 EXPECT_EQ(1u, output_surface_->num_sent_frames());
146 } 146 }
147 147
148 } // namespace 148 } // namespace
149 } // namespace cc 149 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698