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

Side by Side Diff: ui/compositor/compositor.cc

Issue 1124523003: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/profiler/scoped_tracker.h" 14 #include "base/profiler/scoped_tracker.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/sys_info.h" 16 #include "base/sys_info.h"
17 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
18 #include "cc/base/switches.h" 18 #include "cc/base/switches.h"
19 #include "cc/input/input_handler.h" 19 #include "cc/input/input_handler.h"
20 #include "cc/layers/layer.h" 20 #include "cc/layers/layer.h"
21 #include "cc/output/begin_frame_args.h" 21 #include "cc/output/begin_frame_args.h"
22 #include "cc/output/context_provider.h" 22 #include "cc/output/context_provider.h"
23 #include "cc/output/latency_info_swap_promise.h" 23 #include "cc/output/latency_info_swap_promise.h"
24 #include "cc/scheduler/begin_frame_source.h" 24 #include "cc/scheduler/begin_frame_source.h"
25 #include "cc/surfaces/surface_id_allocator.h" 25 #include "cc/surfaces/surface_id_allocator.h"
26 #include "cc/trees/layer_tree_host.h" 26 #include "cc/trees/layer_tree_host.h"
27 #include "third_party/skia/include/core/SkBitmap.h" 27 #include "third_party/skia/include/core/SkBitmap.h"
28 #include "ui/compositor/compositor_observer.h" 28 #include "ui/compositor/compositor_observer.h"
29 #include "ui/compositor/compositor_switches.h" 29 #include "ui/compositor/compositor_switches.h"
30 #include "ui/compositor/compositor_vsync_manager.h"
30 #include "ui/compositor/dip_util.h" 31 #include "ui/compositor/dip_util.h"
31 #include "ui/compositor/layer.h" 32 #include "ui/compositor/layer.h"
32 #include "ui/compositor/layer_animator_collection.h" 33 #include "ui/compositor/layer_animator_collection.h"
33 #include "ui/gfx/frame_time.h" 34 #include "ui/gfx/frame_time.h"
34 #include "ui/gl/gl_context.h" 35 #include "ui/gl/gl_context.h"
35 #include "ui/gl/gl_switches.h" 36 #include "ui/gl/gl_switches.h"
36 37
37 namespace { 38 namespace {
38 39
39 const double kDefaultRefreshRate = 60.0; 40 const double kDefaultRefreshRate = 60.0;
(...skipping 25 matching lines...) Expand all
65 } 66 }
66 67
67 Compositor::Compositor(gfx::AcceleratedWidget widget, 68 Compositor::Compositor(gfx::AcceleratedWidget widget,
68 ui::ContextFactory* context_factory, 69 ui::ContextFactory* context_factory,
69 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 70 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
70 : context_factory_(context_factory), 71 : context_factory_(context_factory),
71 root_layer_(NULL), 72 root_layer_(NULL),
72 widget_(widget), 73 widget_(widget),
73 surface_id_allocator_(context_factory->CreateSurfaceIdAllocator()), 74 surface_id_allocator_(context_factory->CreateSurfaceIdAllocator()),
74 task_runner_(task_runner), 75 task_runner_(task_runner),
76 vsync_manager_(new CompositorVSyncManager()),
75 device_scale_factor_(0.0f), 77 device_scale_factor_(0.0f),
76 last_started_frame_(0), 78 last_started_frame_(0),
77 last_ended_frame_(0), 79 last_ended_frame_(0),
78 locks_will_time_out_(true), 80 locks_will_time_out_(true),
79 compositor_lock_(NULL), 81 compositor_lock_(NULL),
80 layer_animator_collection_(this), 82 layer_animator_collection_(this),
81 weak_ptr_factory_(this) { 83 weak_ptr_factory_(this) {
82 root_web_layer_ = cc::Layer::Create(); 84 root_web_layer_ = cc::Layer::Create();
83 85
84 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 86 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 } 250 }
249 251
250 void Compositor::SetVisible(bool visible) { 252 void Compositor::SetVisible(bool visible) {
251 host_->SetVisible(visible); 253 host_->SetVisible(visible);
252 } 254 }
253 255
254 bool Compositor::IsVisible() { 256 bool Compositor::IsVisible() {
255 return host_->visible(); 257 return host_->visible();
256 } 258 }
257 259
258 void Compositor::SetAuthoritativeVSyncInterval( 260 scoped_refptr<CompositorVSyncManager> Compositor::vsync_manager() const {
259 const base::TimeDelta& interval) { 261 return vsync_manager_;
260 host_->SetAuthoritativeVSyncInterval(interval);
261 } 262 }
262 263
263 void Compositor::AddObserver(CompositorObserver* observer) { 264 void Compositor::AddObserver(CompositorObserver* observer) {
264 observer_list_.AddObserver(observer); 265 observer_list_.AddObserver(observer);
265 } 266 }
266 267
267 void Compositor::RemoveObserver(CompositorObserver* observer) { 268 void Compositor::RemoveObserver(CompositorObserver* observer) {
268 observer_list_.RemoveObserver(observer); 269 observer_list_.RemoveObserver(observer);
269 } 270 }
270 271
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 observer_list_, 424 observer_list_,
424 OnCompositingLockStateChanged(this)); 425 OnCompositingLockStateChanged(this));
425 } 426 }
426 427
427 void Compositor::CancelCompositorLock() { 428 void Compositor::CancelCompositorLock() {
428 if (compositor_lock_) 429 if (compositor_lock_)
429 compositor_lock_->CancelLock(); 430 compositor_lock_->CancelLock();
430 } 431 }
431 432
432 } // namespace ui 433 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698