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

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

Issue 2644653003: Make OffscreenCanvas animation in sync with its placeholder canvas's parent frame rate (Closed)
Patch Set: safeguard Created 3 years, 11 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/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::RegisterFrameSinkToItsParent(
Fady Samuel 2017/01/19 04:05:43 nit: RegisterFrameSinkToParent?
xlai (Olivia) 2017/01/19 16:43:56 Done.
31 cc::FrameSinkId child_frame_sink_id) {
Fady Samuel 2017/01/19 04:05:43 nit: const cc::FrameSinkId&
xlai (Olivia) 2017/01/19 16:43:56 Done.
32 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
33 if (surface_iter == registered_surface_instances_.end())
34 return;
35 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
36 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
37 GetSurfaceManager()->RegisterFrameSinkHierarchy(
38 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
39 }
40 }
41
42 void OffscreenCanvasSurfaceManager::UnregisterFrameSinkFromItsParent(
Fady Samuel 2017/01/19 04:05:43 nit: UnregisterFrameSinkFromParent?
xlai (Olivia) 2017/01/19 16:43:56 Done.
43 cc::FrameSinkId child_frame_sink_id) {
Fady Samuel 2017/01/19 04:05:43 const cc::FrameSinkId&
xlai (Olivia) 2017/01/19 16:43:56 Done.
44 auto surface_iter = registered_surface_instances_.find(child_frame_sink_id);
45 if (surface_iter == registered_surface_instances_.end())
46 return;
47 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
48 if (surfaceImpl->parent_frame_sink_id().is_valid()) {
49 GetSurfaceManager()->UnregisterFrameSinkHierarchy(
50 surfaceImpl->parent_frame_sink_id(), child_frame_sink_id);
51 }
52 }
53
30 void OffscreenCanvasSurfaceManager::OnSurfaceCreated( 54 void OffscreenCanvasSurfaceManager::OnSurfaceCreated(
31 const cc::SurfaceInfo& surface_info) { 55 const cc::SurfaceInfo& surface_info) {
32 auto surface_iter = 56 auto surface_iter =
33 registered_surface_instances_.find(surface_info.id().frame_sink_id()); 57 registered_surface_instances_.find(surface_info.id().frame_sink_id());
34 if (surface_iter == registered_surface_instances_.end()) 58 if (surface_iter == registered_surface_instances_.end())
35 return; 59 return;
36 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second; 60 OffscreenCanvasSurfaceImpl* surfaceImpl = surface_iter->second;
37 surfaceImpl->OnSurfaceCreated(surface_info); 61 surfaceImpl->OnSurfaceCreated(surface_info);
38 } 62 }
39 63
40 void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance( 64 void OffscreenCanvasSurfaceManager::RegisterOffscreenCanvasSurfaceInstance(
41 cc::FrameSinkId frame_sink_id, 65 cc::FrameSinkId frame_sink_id,
Fady Samuel 2017/01/19 04:05:43 nit: const cc::FrameSinkId&
xlai (Olivia) 2017/01/19 16:43:56 Done.
42 OffscreenCanvasSurfaceImpl* surface_instance) { 66 OffscreenCanvasSurfaceImpl* surface_instance) {
43 DCHECK(surface_instance); 67 DCHECK(surface_instance);
44 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u); 68 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 0u);
45 registered_surface_instances_[frame_sink_id] = surface_instance; 69 registered_surface_instances_[frame_sink_id] = surface_instance;
46 } 70 }
47 71
48 void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance( 72 void OffscreenCanvasSurfaceManager::UnregisterOffscreenCanvasSurfaceInstance(
49 cc::FrameSinkId frame_sink_id) { 73 cc::FrameSinkId frame_sink_id) {
Fady Samuel 2017/01/19 04:05:43 nit: const cc::FrameSinkId&
xlai (Olivia) 2017/01/19 16:43:56 Done.
50 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u); 74 DCHECK_EQ(registered_surface_instances_.count(frame_sink_id), 1u);
51 registered_surface_instances_.erase(frame_sink_id); 75 registered_surface_instances_.erase(frame_sink_id);
52 } 76 }
53 77
54 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance( 78 OffscreenCanvasSurfaceImpl* OffscreenCanvasSurfaceManager::GetSurfaceInstance(
55 cc::FrameSinkId frame_sink_id) { 79 cc::FrameSinkId frame_sink_id) {
Fady Samuel 2017/01/19 04:05:43 nit: const cc::FrameSinkId&
xlai (Olivia) 2017/01/19 16:43:56 Done.
56 auto search = registered_surface_instances_.find(frame_sink_id); 80 auto search = registered_surface_instances_.find(frame_sink_id);
57 if (search != registered_surface_instances_.end()) { 81 if (search != registered_surface_instances_.end()) {
58 return search->second; 82 return search->second;
59 } 83 }
60 return nullptr; 84 return nullptr;
61 } 85 }
62 86
63 } // namespace content 87 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698