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

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

Issue 2737653005: Rename OffscreenCanvasSurfaceManager to OffscreenCanvasCompositorFrameSinkManager (Closed)
Patch Set: Format header Created 3 years, 9 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 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_m anager.h"
6
5 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
6 #include "cc/surfaces/surface_manager.h" 8 #include "cc/surfaces/surface_manager.h"
7 #include "content/browser/compositor/surface_utils.h" 9 #include "content/browser/compositor/surface_utils.h"
8 #include "content/browser/renderer_host/offscreen_canvas_surface_manager.h"
9 10
10 namespace content { 11 namespace content {
11 12
12 namespace { 13 namespace {
13 base::LazyInstance<OffscreenCanvasSurfaceManager>::Leaky g_manager = 14 base::LazyInstance<OffscreenCanvasCompositorFrameSinkManager>::Leaky g_manager =
14 LAZY_INSTANCE_INITIALIZER; 15 LAZY_INSTANCE_INITIALIZER;
15 } 16 }
16 17
17 OffscreenCanvasSurfaceManager::OffscreenCanvasSurfaceManager() { 18 OffscreenCanvasCompositorFrameSinkManager::
19 OffscreenCanvasCompositorFrameSinkManager() {
18 GetSurfaceManager()->AddObserver(this); 20 GetSurfaceManager()->AddObserver(this);
19 } 21 }
20 22
21 OffscreenCanvasSurfaceManager::~OffscreenCanvasSurfaceManager() { 23 OffscreenCanvasCompositorFrameSinkManager::
24 ~OffscreenCanvasCompositorFrameSinkManager() {
22 registered_surface_instances_.clear(); 25 registered_surface_instances_.clear();
23 GetSurfaceManager()->RemoveObserver(this); 26 GetSurfaceManager()->RemoveObserver(this);
24 } 27 }
25 28
26 OffscreenCanvasSurfaceManager* OffscreenCanvasSurfaceManager::GetInstance() { 29 OffscreenCanvasCompositorFrameSinkManager*
30 OffscreenCanvasCompositorFrameSinkManager::GetInstance() {
27 return g_manager.Pointer(); 31 return g_manager.Pointer();
28 } 32 }
29 33
30 void OffscreenCanvasSurfaceManager::RegisterFrameSinkToParent( 34 void OffscreenCanvasCompositorFrameSinkManager::RegisterFrameSinkToParent(
31 const cc::FrameSinkId& child_frame_sink_id) { 35 const cc::FrameSinkId& child_frame_sink_id) {
32 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); 36 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
33 if (surface_iter == registered_surface_instances_.end()) 37 if (surface_iter == registered_surface_instances_.end())
34 return; 38 return;
35 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 39 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
36 if (surfaceImpl->parent_frame_sink_id().is_valid()) { 40 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
37 GetSurfaceManager()->RegisterFrameSinkHierarchy( 41 GetSurfaceManager()->RegisterFrameSinkHierarchy(
38 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id); 42 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
39 } 43 }
40 } 44 }
41 45
42 void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromParent( 46 void OffscreenCanvasCompositorFrameSinkManager::UnregisterFrameSinkFromParent(
43 const cc::FrameSinkId& child_frame_sink_id) { 47 const cc::FrameSinkId& child_frame_sink_id) {
44 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); 48 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
45 if (surface_iter == registered_surface_instances_.end()) 49 if (surface_iter == registered_surface_instances_.end())
46 return; 50 return;
47 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 51 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
48 if (surfaceImpl->parent_frame_sink_id().is_valid()) { 52 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
49 GetSurfaceManager()->UnregisterFrameSinkHierarchy( 53 GetSurfaceManager()->UnregisterFrameSinkHierarchy(
50 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id); 54 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
51 } 55 }
52 } 56 }
53 57
54 void OffscreenCanvasSurfaceManager::OnSurfaceCreated( 58 void OffscreenCanvasCompositorFrameSinkManager::OnSurfaceCreated(
55 const cc::SurfaceInfo& surface_info) { 59 const cc::SurfaceInfo& surface_info) {
56 auto surface_iter = 60 auto surface_iter =
57 registered_surface_instances_.find(surface_info.id().frame_sink_id()); 61 registered_surface_instances_.find(surface_info.id().frame_sink_id());
58 if (surface_iter == registered_surface_instances_.end()) 62 if (surface_iter == registered_surface_instances_.end())
59 return; 63 return;
60 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 64 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
61 surfaceImpl->OnSurfaceCreated(surface_info); 65 surfaceImpl->OnSurfaceCreated(surface_info);
62 } 66 }
63 67
64 void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance( 68 void OffscreenCanvasCompositorFrameSinkManager::
65 const cc::FrameSinkId& frame_sink_id, 69 RegisterOffscreenCanvasSurfaceInstance(
66 OffscreenCanvasSurfaceImpl* surface_instance) { 70 const cc::FrameSinkId& frame_sink_id,
71 OffscreenCanvasSurfaceImpl* surface_instance) {
67 DCHECK(surface_instance); 72 DCHECK(surface_instance);
68 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u); 73 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u);
69 registered_surface_instances_[frame_sink_id] = surface_instance; 74 registered_surface_instances_[frame_sink_id] = surface_instance;
70 } 75 }
71 76
72 void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance( 77 void OffscreenCanvasCompositorFrameSinkManager::
73 const cc::FrameSinkId& frame_sink_id) { 78 UnregisterOffscreenCanvasSurfaceInstance(
79 const cc::FrameSinkId& frame_sink_id) {
74 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u); 80 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u);
75 registered_surface_instances_.erase(frame_sink_id); 81 registered_surface_instances_.erase(frame_sink_id);
76 } 82 }
77 83
78 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance( 84 OffscreenCanvasSurfaceImpl*
85 OffscreenCanvasCompositorFrameSinkManager::GetSurfaceInstance(
79 const cc::FrameSinkId& frame_sink_id) { 86 const cc::FrameSinkId& frame_sink_id) {
80 auto search = registered_surface_instances_.find(frame_sink_id); 87 auto search = registered_surface_instances_.find(frame_sink_id);
81 if (search != registered_surface_instances_.end()) { 88 if (search != registered_surface_instances_.end()) {
82 return search->second; 89 return search->second;
83 } 90 }
84 return nullptr; 91 return nullptr;
85 } 92 }
86 93
87 } // namespace content 94 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698