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

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

Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator (Closed)
Patch Set: Delete useless include 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
« no previous file with comments | « ui/aura/mus/DEPS ('k') | ui/compositor/compositor_unittest.cc » ('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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <deque> 10 #include <deque>
(...skipping 10 matching lines...) Expand all
21 #include "cc/animation/animation_host.h" 21 #include "cc/animation/animation_host.h"
22 #include "cc/animation/animation_id_provider.h" 22 #include "cc/animation/animation_id_provider.h"
23 #include "cc/animation/animation_timeline.h" 23 #include "cc/animation/animation_timeline.h"
24 #include "cc/base/switches.h" 24 #include "cc/base/switches.h"
25 #include "cc/input/input_handler.h" 25 #include "cc/input/input_handler.h"
26 #include "cc/layers/layer.h" 26 #include "cc/layers/layer.h"
27 #include "cc/output/begin_frame_args.h" 27 #include "cc/output/begin_frame_args.h"
28 #include "cc/output/context_provider.h" 28 #include "cc/output/context_provider.h"
29 #include "cc/output/latency_info_swap_promise.h" 29 #include "cc/output/latency_info_swap_promise.h"
30 #include "cc/scheduler/begin_frame_source.h" 30 #include "cc/scheduler/begin_frame_source.h"
31 #include "cc/surfaces/surface_id_allocator.h" 31 #include "cc/surfaces/local_surface_id_allocator.h"
32 #include "cc/surfaces/surface_manager.h" 32 #include "cc/surfaces/surface_manager.h"
33 #include "cc/trees/layer_tree_host.h" 33 #include "cc/trees/layer_tree_host.h"
34 #include "cc/trees/layer_tree_settings.h" 34 #include "cc/trees/layer_tree_settings.h"
35 #include "third_party/skia/include/core/SkBitmap.h" 35 #include "third_party/skia/include/core/SkBitmap.h"
36 #include "ui/compositor/compositor_observer.h" 36 #include "ui/compositor/compositor_observer.h"
37 #include "ui/compositor/compositor_switches.h" 37 #include "ui/compositor/compositor_switches.h"
38 #include "ui/compositor/compositor_vsync_manager.h" 38 #include "ui/compositor/compositor_vsync_manager.h"
39 #include "ui/compositor/dip_util.h" 39 #include "ui/compositor/dip_util.h"
40 #include "ui/compositor/layer.h" 40 #include "ui/compositor/layer.h"
41 #include "ui/compositor/layer_animator_collection.h" 41 #include "ui/compositor/layer_animator_collection.h"
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 for (auto& observer : observer_list_) 559 for (auto& observer : observer_list_)
560 observer.OnCompositingLockStateChanged(this); 560 observer.OnCompositingLockStateChanged(this);
561 } 561 }
562 562
563 void Compositor::CancelCompositorLock() { 563 void Compositor::CancelCompositorLock() {
564 if (compositor_lock_) 564 if (compositor_lock_)
565 compositor_lock_->CancelLock(); 565 compositor_lock_->CancelLock();
566 } 566 }
567 567
568 } // namespace ui 568 } // namespace ui
OLDNEW
« no previous file with comments | « ui/aura/mus/DEPS ('k') | ui/compositor/compositor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698