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

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

Issue 2584643002: Revamp OffscreenCanvas commit flow (Closed)
Patch Set: Furnish Created 4 years 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/surface_manager.h" 6 #include "cc/surfaces/surface_manager.h"
7 #include "content/browser/compositor/surface_utils.h" 7 #include "content/browser/compositor/surface_utils.h"
8 #include "content/browser/renderer_host/offscreen_canvas_surface_manager.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<OffscreenCanvasSurfaceManager>::Leaky g_manager =
14 LAZY_INSTANCE_INITIALIZER; 14 LAZY_INSTANCE_INITIALIZER;
15 } 15 }
16 16
17 OffscreenCanvasSurfaceManager::OffscreenCanvasSurfaceManager() { 17 OffscreenCanvasSurfaceManager::OffscreenCanvasSurfaceManager() {
18 GetSurfaceManager()->AddObserver(this); 18 GetSurfaceManager()->AddObserver(this);
19 } 19 }
20 20
21 OffscreenCanvasSurfaceManager::~OffscreenCanvasSurfaceManager() { 21 OffscreenCanvasSurfaceManager::~OffscreenCanvasSurfaceManager() {
22 registered_surface_instances_.clear(); 22 registered_surface_instances_.clear();
23 GetSurfaceManager()->RemoveObserver(this); 23 GetSurfaceManager()->RemoveObserver(this);
24 } 24 }
25 25
26 OffscreenCanvasSurfaceManager* OffscreenCanvasSurfaceManager::GetInstance() { 26 OffscreenCanvasSurfaceManager* OffscreenCanvasSurfaceManager::GetInstance() {
27 return g_manager.Pointer(); 27 return g_manager.Pointer();
28 } 28 }
29 29
30 void OffscreenCanvasSurfaceManager::OnSurfaceCreated(
31 const cc::SurfaceId& surface_id,
32 const gfx::Size& frame_size,
33 float device_scale_factor) {
34 auto surface_iter =
35 registered_surface_instances_.find(surface_id.frame_sink_id());
36 if (surface_iter == registered_surface_instances_.end()) {
Fady Samuel 2016/12/15 19:54:52 no need for braces.
xlai (Olivia) 2016/12/15 22:20:12 Done.
37 return;
38 }
39 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
40 surfaceImpl->OnSurfaceCreated(surface_id, frame_size, device_scale_factor);
41 }
42
30 void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance( 43 void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance(
31 cc::FrameSinkId frame_sink_id, 44 cc::FrameSinkId frame_sink_id,
32 OffscreenCanvasSurfaceImpl* surface_instance) { 45 OffscreenCanvasSurfaceImpl* surface_instance) {
33 DCHECK(surface_instance); 46 DCHECK(surface_instance);
34 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u); 47 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u);
35 registered_surface_instances_[frame_sink_id] = surface_instance; 48 registered_surface_instances_[frame_sink_id] = surface_instance;
36 } 49 }
37 50
38 void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance( 51 void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance(
39 cc::FrameSinkId frame_sink_id) { 52 cc::FrameSinkId frame_sink_id) {
40 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u); 53 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u);
41 registered_surface_instances_.erase(frame_sink_id); 54 registered_surface_instances_.erase(frame_sink_id);
42 } 55 }
43 56
44 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance( 57 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance(
45 cc::FrameSinkId frame_sink_id) { 58 cc::FrameSinkId frame_sink_id) {
46 auto search = registered_surface_instances_.find(frame_sink_id); 59 auto search = registered_surface_instances_.find(frame_sink_id);
47 if (search != registered_surface_instances_.end()) { 60 if (search != registered_surface_instances_.end()) {
48 return search->second; 61 return search->second;
49 } 62 }
50 return nullptr; 63 return nullptr;
51 } 64 }
52 65
53 } // namespace content 66 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698