Index: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.cc |
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_manager.cc b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.cc |
similarity index 67% |
rename from content/browser/renderer_host/offscreen_canvas_surface_manager.cc |
rename to content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.cc |
index 1eb9373fdfa2fd837f66460e6fd6b9d3d10cdfa9..ef4cbcd9ec40ed288fb2592fd452503b9e157c03 100644 |
--- a/content/browser/renderer_host/offscreen_canvas_surface_manager.cc |
+++ b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.cc |
@@ -2,32 +2,36 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_manager.h" |
+ |
#include "base/lazy_instance.h" |
#include "cc/surfaces/surface_manager.h" |
#include "content/browser/compositor/surface_utils.h" |
-#include "content/browser/renderer_host/offscreen_canvas_surface_manager.h" |
namespace content { |
namespace { |
-base::LazyInstance<OffscreenCanvasSurfaceManager>::Leaky g_manager = |
+base::LazyInstance<OffscreenCanvasCompositorFrameSinkManager>::Leaky g_manager = |
LAZY_INSTANCE_INITIALIZER; |
} |
-OffscreenCanvasSurfaceManager::OffscreenCanvasSurfaceManager() { |
+OffscreenCanvasCompositorFrameSinkManager:: |
+ OffscreenCanvasCompositorFrameSinkManager() { |
GetSurfaceManager()->AddObserver(this); |
} |
-OffscreenCanvasSurfaceManager::~OffscreenCanvasSurfaceManager() { |
+OffscreenCanvasCompositorFrameSinkManager:: |
+ ~OffscreenCanvasCompositorFrameSinkManager() { |
registered_surface_instances_.clear(); |
GetSurfaceManager()->RemoveObserver(this); |
} |
-OffscreenCanvasSurfaceManager* OffscreenCanvasSurfaceManager::GetInstance() { |
+OffscreenCanvasCompositorFrameSinkManager* |
+OffscreenCanvasCompositorFrameSinkManager::GetInstance() { |
return g_manager.Pointer(); |
} |
-void OffscreenCanvasSurfaceManager::RegisterFrameSinkToParent( |
+void OffscreenCanvasCompositorFrameSinkManager::RegisterFrameSinkToParent( |
const cc::FrameSinkId& child_frame_sink_id) { |
auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); |
if (surface_iter == registered_surface_instances_.end()) |
@@ -39,7 +43,7 @@ void OffscreenCanvasSurfaceManager::RegisterFrameSinkToParent( |
} |
} |
-void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromParent( |
+void OffscreenCanvasCompositorFrameSinkManager::UnregisterFrameSinkFromParent( |
const cc::FrameSinkId& child_frame_sink_id) { |
auto surface_iter = registered_surface_instances_.find(child_frame_sink_id); |
if (surface_iter == registered_surface_instances_.end()) |
@@ -51,7 +55,7 @@ void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromParent( |
} |
} |
-void OffscreenCanvasSurfaceManager::OnSurfaceCreated( |
+void OffscreenCanvasCompositorFrameSinkManager::OnSurfaceCreated( |
const cc::SurfaceInfo& surface_info) { |
auto surface_iter = |
registered_surface_instances_.find(surface_info.id().frame_sink_id()); |
@@ -61,21 +65,24 @@ void OffscreenCanvasSurfaceManager::OnSurfaceCreated( |
surfaceImpl->OnSurfaceCreated(surface_info); |
} |
-void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance( |
- const cc::FrameSinkId& frame_sink_id, |
- OffscreenCanvasSurfaceImpl* surface_instance) { |
+void OffscreenCanvasCompositorFrameSinkManager:: |
+ RegisterOffscreenCanvasSurfaceInstance( |
+ const cc::FrameSinkId& frame_sink_id, |
+ OffscreenCanvasSurfaceImpl* surface_instance) { |
DCHECK(surface_instance); |
DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u); |
registered_surface_instances_[frame_sink_id] = surface_instance; |
} |
-void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance( |
- const cc::FrameSinkId& frame_sink_id) { |
+void OffscreenCanvasCompositorFrameSinkManager:: |
+ UnregisterOffscreenCanvasSurfaceInstance( |
+ const cc::FrameSinkId& frame_sink_id) { |
DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u); |
registered_surface_instances_.erase(frame_sink_id); |
} |
-OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance( |
+OffscreenCanvasSurfaceImpl* |
+OffscreenCanvasCompositorFrameSinkManager::GetSurfaceInstance( |
const cc::FrameSinkId& frame_sink_id) { |
auto search = registered_surface_instances_.find(frame_sink_id); |
if (search != registered_surface_instances_.end()) { |