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

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

Issue 612323010: Align base::hash_map with C++11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try a different tack for C++ insanity Created 6 years, 2 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 <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/containers/hash_tables.h" 13 #include "base/containers/hash_tables.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "cc/base/scoped_ptr_vector.h" 15 #include "cc/base/scoped_ptr_vector.h"
16 #include "cc/base/swap_promise.h" 16 #include "cc/base/swap_promise.h"
17 #include "cc/layers/layer_impl.h" 17 #include "cc/layers/layer_impl.h"
18 #include "cc/output/renderer.h" 18 #include "cc/output/renderer.h"
19 #include "cc/resources/ui_resource_client.h" 19 #include "cc/resources/ui_resource_client.h"
20 20
21 #if defined(COMPILER_GCC)
22 namespace BASE_HASH_NAMESPACE {
23 template<>
24 struct hash<cc::LayerImpl*> {
25 size_t operator()(cc::LayerImpl* ptr) const {
26 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
27 }
28 };
29 } // namespace BASE_HASH_NAMESPACE
30 #endif // COMPILER
31
32 namespace base { 21 namespace base {
33 namespace debug { 22 namespace debug {
34 class TracedValue; 23 class TracedValue;
35 } 24 }
36 } 25 }
37 26
38 namespace cc { 27 namespace cc {
39 28
40 class ContextProvider; 29 class ContextProvider;
41 class DebugRectHistory; 30 class DebugRectHistory;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 float top_controls_delta_; 381 float top_controls_delta_;
393 float sent_top_controls_delta_; 382 float sent_top_controls_delta_;
394 383
395 private: 384 private:
396 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 385 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
397 }; 386 };
398 387
399 } // namespace cc 388 } // namespace cc
400 389
401 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 390 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698