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