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

Side by Side Diff: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: up Created 4 years, 1 month 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 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 "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h " 5 #include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h "
6 6
7 #include "cc/surfaces/surface.h" 7 #include "cc/surfaces/surface.h"
8 #include "cc/surfaces/surface_manager.h" 8 #include "cc/surfaces/surface_manager.h"
9 #include "content/browser/compositor/surface_utils.h" 9 #include "content/browser/compositor/surface_utils.h"
10 #include "mojo/public/cpp/bindings/strong_binding.h" 10 #include "mojo/public/cpp/bindings/strong_binding.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 OffscreenCanvasCompositorFrameSink::OffscreenCanvasCompositorFrameSink( 14 OffscreenCanvasCompositorFrameSink::OffscreenCanvasCompositorFrameSink(
15 const cc::SurfaceId& surface_id, 15 const cc::SurfaceId& surface_id,
16 cc::mojom::MojoCompositorFrameSinkClientPtr client) 16 cc::mojom::MojoCompositorFrameSinkClientPtr client)
17 : surface_id_(surface_id), client_(std::move(client)) { 17 : surface_id_(surface_id), client_(std::move(client)) {
18 cc::SurfaceManager* manager = GetSurfaceManager(); 18 cc::SurfaceManager* manager = GetSurfaceManager();
19 surface_factory_ = base::MakeUnique<cc::SurfaceFactory>( 19 surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
20 surface_id_.frame_sink_id(), manager, this); 20 surface_id_.frame_sink_id(), manager, this);
21 manager->RegisterFrameSinkId(surface_id_.frame_sink_id()); 21 manager->RegisterFrameSinkId(surface_id_.frame_sink_id());
22 surface_factory_->Create(surface_id_.local_frame_id());
23 } 22 }
24 23
25 OffscreenCanvasCompositorFrameSink::~OffscreenCanvasCompositorFrameSink() { 24 OffscreenCanvasCompositorFrameSink::~OffscreenCanvasCompositorFrameSink() {
26 cc::SurfaceManager* manager = GetSurfaceManager(); 25 cc::SurfaceManager* manager = GetSurfaceManager();
27 if (!manager) { 26 if (!manager) {
28 // Inform SurfaceFactory that SurfaceManager's no longer alive to 27 // Inform SurfaceFactory that SurfaceManager's no longer alive to
29 // avoid its destruction error. 28 // avoid its destruction error.
30 surface_factory_->DidDestroySurfaceManager(); 29 surface_factory_->DidDestroySurfaceManager();
31 } else { 30 } else {
32 manager->InvalidateFrameSinkId(surface_id_.frame_sink_id()); 31 manager->InvalidateFrameSinkId(surface_id_.frame_sink_id());
33 } 32 }
34 surface_factory_->Destroy(surface_id_.local_frame_id());
35 } 33 }
36 34
37 // static 35 // static
38 void OffscreenCanvasCompositorFrameSink::Create( 36 void OffscreenCanvasCompositorFrameSink::Create(
39 const cc::SurfaceId& surface_id, 37 const cc::SurfaceId& surface_id,
40 cc::mojom::MojoCompositorFrameSinkClientPtr client, 38 cc::mojom::MojoCompositorFrameSinkClientPtr client,
41 cc::mojom::MojoCompositorFrameSinkRequest request) { 39 cc::mojom::MojoCompositorFrameSinkRequest request) {
42 mojo::MakeStrongBinding(base::MakeUnique<OffscreenCanvasCompositorFrameSink>( 40 mojo::MakeStrongBinding(base::MakeUnique<OffscreenCanvasCompositorFrameSink>(
43 surface_id, std::move(client)), 41 surface_id, std::move(client)),
44 std::move(request)); 42 std::move(request));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 client_->DidReceiveCompositorFrameAck(); 84 client_->DidReceiveCompositorFrameAck();
87 DCHECK_GT(ack_pending_count_, 0); 85 DCHECK_GT(ack_pending_count_, 0);
88 if (!surface_returned_resources_.empty()) { 86 if (!surface_returned_resources_.empty()) {
89 client_->ReclaimResources(surface_returned_resources_); 87 client_->ReclaimResources(surface_returned_resources_);
90 surface_returned_resources_.clear(); 88 surface_returned_resources_.clear();
91 } 89 }
92 ack_pending_count_--; 90 ack_pending_count_--;
93 } 91 }
94 92
95 } // namespace content 93 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698