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

Side by Side Diff: cc/trees/layer_tree_host.h

Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp bustage Created 7 years, 3 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 | « cc/output/compositor_frame_metadata.h ('k') | cc/trees/layer_tree_impl.h » ('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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #ifndef CC_TREES_LAYER_TREE_HOST_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_H_
6 #define CC_TREES_LAYER_TREE_HOST_H_ 6 #define CC_TREES_LAYER_TREE_HOST_H_
7 7
8 #include <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 #include <vector> 10 #include <vector>
(...skipping 17 matching lines...) Expand all
28 #include "cc/resources/scoped_ui_resource.h" 28 #include "cc/resources/scoped_ui_resource.h"
29 #include "cc/resources/ui_resource_bitmap.h" 29 #include "cc/resources/ui_resource_bitmap.h"
30 #include "cc/resources/ui_resource_client.h" 30 #include "cc/resources/ui_resource_client.h"
31 #include "cc/scheduler/rate_limiter.h" 31 #include "cc/scheduler/rate_limiter.h"
32 #include "cc/trees/layer_tree_host_client.h" 32 #include "cc/trees/layer_tree_host_client.h"
33 #include "cc/trees/layer_tree_host_common.h" 33 #include "cc/trees/layer_tree_host_common.h"
34 #include "cc/trees/layer_tree_settings.h" 34 #include "cc/trees/layer_tree_settings.h"
35 #include "cc/trees/occlusion_tracker.h" 35 #include "cc/trees/occlusion_tracker.h"
36 #include "cc/trees/proxy.h" 36 #include "cc/trees/proxy.h"
37 #include "third_party/skia/include/core/SkColor.h" 37 #include "third_party/skia/include/core/SkColor.h"
38 #include "ui/base/latency_info.h" 38 #include "ui/events/latency_info.h"
39 #include "ui/gfx/rect.h" 39 #include "ui/gfx/rect.h"
40 40
41 namespace WebKit { class WebGraphicsContext3D; } 41 namespace WebKit { class WebGraphicsContext3D; }
42 42
43 #if defined(COMPILER_GCC) 43 #if defined(COMPILER_GCC)
44 namespace BASE_HASH_NAMESPACE { 44 namespace BASE_HASH_NAMESPACE {
45 template <> 45 template <>
46 struct hash<WebKit::WebGraphicsContext3D*> { 46 struct hash<WebKit::WebGraphicsContext3D*> {
47 size_t operator()(WebKit::WebGraphicsContext3D* ptr) const { 47 size_t operator()(WebKit::WebGraphicsContext3D* ptr) const {
48 return hash<size_t>()(reinterpret_cast<size_t>(ptr)); 48 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 scoped_refptr<Layer> page_scale_layer_; 452 scoped_refptr<Layer> page_scale_layer_;
453 scoped_refptr<Layer> inner_viewport_scroll_layer_; 453 scoped_refptr<Layer> inner_viewport_scroll_layer_;
454 scoped_refptr<Layer> outer_viewport_scroll_layer_; 454 scoped_refptr<Layer> outer_viewport_scroll_layer_;
455 455
456 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 456 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
457 }; 457 };
458 458
459 } // namespace cc 459 } // namespace cc
460 460
461 #endif // CC_TREES_LAYER_TREE_HOST_H_ 461 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW
« no previous file with comments | « cc/output/compositor_frame_metadata.h ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698