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

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

Issue 2684933003: Move frame_sink_id management to framesink_manager.cc/h from (Closed)
Patch Set: Created 3 years, 10 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 "base/lazy_instance.h" 5 #include "base/lazy_instance.h"
6 #include "cc/surfaces/framesink_manager.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 #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<OffscreenCanvasSurfaceManager>::Leaky g_manager =
14 LAZY_INSTANCE_INITIALIZER; 15 LAZY_INSTANCE_INITIALIZER;
15 } 16 }
(...skipping 11 matching lines...) Expand all
27 return g_manager.Pointer(); 28 return g_manager.Pointer();
28 } 29 }
29 30
30 void OffscreenCanvasSurfaceManager::RegisterFrameSinkToParent( 31 void OffscreenCanvasSurfaceManager::RegisterFrameSinkToParent(
31 const cc::FrameSinkId& child_frame_sink_id) { 32 const cc::FrameSinkId& child_frame_sink_id) {
32 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); 33 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
33 if (surface_iter == registered_surface_instances_.end()) 34 if (surface_iter == registered_surface_instances_.end())
34 return; 35 return;
35 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 36 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
36 if (surfaceImpl->parent_frame_sink_id().is_valid()) { 37 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
37 GetSurfaceManager()->RegisterFrameSinkHierarchy( 38 GetFrameSinkManager()->RegisterFrameSinkHierarchy(
38 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id); 39 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
39 } 40 }
40 } 41 }
41 42
42 void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromParent( 43 void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromParent(
43 const cc::FrameSinkId& child_frame_sink_id) { 44 const cc::FrameSinkId& child_frame_sink_id) {
44 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); 45 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
45 if (surface_iter == registered_surface_instances_.end()) 46 if (surface_iter == registered_surface_instances_.end())
46 return; 47 return;
47 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 48 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
48 if (surfaceImpl->parent_frame_sink_id().is_valid()) { 49 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
49 GetSurfaceManager()->UnregisterFrameSinkHierarchy( 50 GetFrameSinkManager()->UnregisterFrameSinkHierarchy(
50 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id); 51 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
51 } 52 }
52 } 53 }
53 54
54 void OffscreenCanvasSurfaceManager::OnSurfaceCreated( 55 void OffscreenCanvasSurfaceManager::OnSurfaceCreated(
55 const cc::SurfaceInfo& surface_info) { 56 const cc::SurfaceInfo& surface_info) {
56 auto surface_iter = 57 auto surface_iter =
57 registered_surface_instances_.find(surface_info.id().frame_sink_id()); 58 registered_surface_instances_.find(surface_info.id().frame_sink_id());
58 if (surface_iter == registered_surface_instances_.end()) 59 if (surface_iter == registered_surface_instances_.end())
59 return; 60 return;
60 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 61 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
(...skipping 17 matching lines...) Expand all
78 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance( 79 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance(
79 const cc::FrameSinkId& frame_sink_id) { 80 const cc::FrameSinkId& frame_sink_id) {
80 auto search = registered_surface_instances_.find(frame_sink_id); 81 auto search = registered_surface_instances_.find(frame_sink_id);
81 if (search != registered_surface_instances_.end()) { 82 if (search != registered_surface_instances_.end()) {
82 return search->second; 83 return search->second;
83 } 84 }
84 return nullptr; 85 return nullptr;
85 } 86 }
86 87
87 } // namespace content 88 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698