OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "android_webview/browser/surfaces_instance.h" | 5 #include "android_webview/browser/surfaces_instance.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "android_webview/browser/aw_gl_surface.h" | 10 #include "android_webview/browser/aw_gl_surface.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( | 65 std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler( |
66 begin_frame_source.get(), nullptr, | 66 begin_frame_source.get(), nullptr, |
67 output_surface_holder->capabilities().max_frames_pending)); | 67 output_surface_holder->capabilities().max_frames_pending)); |
68 display_.reset(new cc::Display( | 68 display_.reset(new cc::Display( |
69 nullptr /* shared_bitmap_manager */, | 69 nullptr /* shared_bitmap_manager */, |
70 nullptr /* gpu_memory_buffer_manager */, settings, | 70 nullptr /* gpu_memory_buffer_manager */, settings, |
71 std::move(begin_frame_source), std::move(output_surface_holder), | 71 std::move(begin_frame_source), std::move(output_surface_holder), |
72 std::move(scheduler), std::move(texture_mailbox_deleter))); | 72 std::move(scheduler), std::move(texture_mailbox_deleter))); |
73 display_->Initialize(this, surface_manager_.get(), | 73 display_->Initialize(this, surface_manager_.get(), |
74 surface_id_allocator_->client_id()); | 74 surface_id_allocator_->client_id()); |
| 75 display_->SetVisible(true); |
75 | 76 |
76 surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this)); | 77 surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this)); |
77 | 78 |
78 DCHECK(!g_surfaces_instance); | 79 DCHECK(!g_surfaces_instance); |
79 g_surfaces_instance = this; | 80 g_surfaces_instance = this; |
80 | 81 |
81 } | 82 } |
82 | 83 |
83 SurfacesInstance::~SurfacesInstance() { | 84 SurfacesInstance::~SurfacesInstance() { |
84 DCHECK_EQ(g_surfaces_instance, this); | 85 DCHECK_EQ(g_surfaces_instance, this); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 CHECK(resources.empty()); | 185 CHECK(resources.empty()); |
185 } | 186 } |
186 | 187 |
187 void SurfacesInstance::SetBeginFrameSource( | 188 void SurfacesInstance::SetBeginFrameSource( |
188 cc::BeginFrameSource* begin_frame_source) { | 189 cc::BeginFrameSource* begin_frame_source) { |
189 // Parent compsitor calls DrawAndSwap directly and doesn't use | 190 // Parent compsitor calls DrawAndSwap directly and doesn't use |
190 // BeginFrameSource. | 191 // BeginFrameSource. |
191 } | 192 } |
192 | 193 |
193 } // namespace android_webview | 194 } // namespace android_webview |
OLD | NEW |