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

Side by Side Diff: cc/trees/layer_tree_impl.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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "cc/layers/layer_impl.h" 14 #include "cc/layers/layer_impl.h"
15 #include "cc/resources/ui_resource_client.h" 15 #include "cc/resources/ui_resource_client.h"
16 #include "ui/base/latency_info.h" 16 #include "ui/events/latency_info.h"
17 17
18 #if defined(COMPILER_GCC) 18 #if defined(COMPILER_GCC)
19 namespace BASE_HASH_NAMESPACE { 19 namespace BASE_HASH_NAMESPACE {
20 template<> 20 template<>
21 struct hash<cc::LayerImpl*> { 21 struct hash<cc::LayerImpl*> {
22 size_t operator()(cc::LayerImpl* ptr) const { 22 size_t operator()(cc::LayerImpl* ptr) const {
23 return hash<size_t>()(reinterpret_cast<size_t>(ptr)); 23 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
24 } 24 }
25 }; 25 };
26 } // namespace BASE_HASH_NAMESPACE 26 } // namespace BASE_HASH_NAMESPACE
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 265
266 UIResourceRequestQueue ui_resource_request_queue_; 266 UIResourceRequestQueue ui_resource_request_queue_;
267 267
268 private: 268 private:
269 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 269 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
270 }; 270 };
271 271
272 } // namespace cc 272 } // namespace cc
273 273
274 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 274 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | content/browser/android/in_process/synchronous_input_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698