| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/hardware_renderer.h" | 5 #include "android_webview/browser/hardware_renderer.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_gl_surface.h" | 9 #include "android_webview/browser/aw_gl_surface.h" |
| 10 #include "android_webview/browser/aw_render_thread_context_provider.h" | 10 #include "android_webview/browser/aw_render_thread_context_provider.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 void HardwareRenderer::AllocateSurface() { | 160 void HardwareRenderer::AllocateSurface() { |
| 161 DCHECK(!child_id_.is_valid()); | 161 DCHECK(!child_id_.is_valid()); |
| 162 child_id_ = local_surface_id_allocator_->GenerateId(); | 162 child_id_ = local_surface_id_allocator_->GenerateId(); |
| 163 surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_)); | 163 surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_)); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void HardwareRenderer::DestroySurface() { | 166 void HardwareRenderer::DestroySurface() { |
| 167 DCHECK(child_id_.is_valid()); | 167 DCHECK(child_id_.is_valid()); |
| 168 | 168 |
| 169 // Submit an empty frame to force any existing resources to be returned. | |
| 170 cc::CompositorFrame frame; | |
| 171 // We submit without a prior BeginFrame, so acknowledge a manual BeginFrame. | |
| 172 frame.metadata.begin_frame_ack = | |
| 173 cc::BeginFrameAck::CreateManualAckWithDamage(); | |
| 174 support_->SubmitCompositorFrame(child_id_, std::move(frame)); | |
| 175 surfaces_->RemoveChildId(cc::SurfaceId(frame_sink_id_, child_id_)); | 169 surfaces_->RemoveChildId(cc::SurfaceId(frame_sink_id_, child_id_)); |
| 176 support_->EvictFrame(); | 170 support_->EvictFrame(); |
| 177 child_id_ = cc::LocalSurfaceId(); | 171 child_id_ = cc::LocalSurfaceId(); |
| 178 } | 172 } |
| 179 | 173 |
| 180 void HardwareRenderer::DidReceiveCompositorFrameAck( | 174 void HardwareRenderer::DidReceiveCompositorFrameAck( |
| 181 const cc::ReturnedResourceArray& resources) { | 175 const cc::ReturnedResourceArray& resources) { |
| 182 ReturnResourcesToCompositor(resources, compositor_id_, | 176 ReturnResourcesToCompositor(resources, compositor_id_, |
| 183 last_submitted_compositor_frame_sink_id_); | 177 last_submitted_compositor_frame_sink_id_); |
| 184 } | 178 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 constexpr bool is_root = false; | 257 constexpr bool is_root = false; |
| 264 constexpr bool handles_frame_sink_id_invalidation = false; | 258 constexpr bool handles_frame_sink_id_invalidation = false; |
| 265 constexpr bool needs_sync_points = true; | 259 constexpr bool needs_sync_points = true; |
| 266 support_.reset(); | 260 support_.reset(); |
| 267 support_ = cc::CompositorFrameSinkSupport::Create( | 261 support_ = cc::CompositorFrameSinkSupport::Create( |
| 268 this, surfaces_->GetSurfaceManager(), frame_sink_id_, is_root, | 262 this, surfaces_->GetSurfaceManager(), frame_sink_id_, is_root, |
| 269 handles_frame_sink_id_invalidation, needs_sync_points); | 263 handles_frame_sink_id_invalidation, needs_sync_points); |
| 270 } | 264 } |
| 271 | 265 |
| 272 } // namespace android_webview | 266 } // namespace android_webview |
| OLD | NEW |