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

Side by Side Diff: gpu/command_buffer/service/async_pixel_transfer_manager.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/memory/linked_ptr.h" 13 #include "base/memory/linked_ptr.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "gpu/command_buffer/service/texture_manager.h" 15 #include "gpu/command_buffer/service/texture_manager.h"
16 #include "gpu/gpu_export.h" 16 #include "gpu/gpu_export.h"
17 17
18 #if defined(COMPILER_GCC)
19 namespace BASE_HASH_NAMESPACE {
20 template <>
21 struct hash<gpu::gles2::TextureRef*> {
22 size_t operator()(gpu::gles2::TextureRef* ptr) const {
23 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
24 }
25 };
26 } // namespace BASE_HASH_NAMESPACE
27 #endif // COMPILER
28
29 namespace gfx { 18 namespace gfx {
30 class GLContext; 19 class GLContext;
31 } 20 }
32 21
33 namespace gpu { 22 namespace gpu {
34 class AsyncPixelTransferDelegate; 23 class AsyncPixelTransferDelegate;
35 class AsyncMemoryParams; 24 class AsyncMemoryParams;
36 struct AsyncTexImage2DParams; 25 struct AsyncTexImage2DParams;
37 26
38 class AsyncPixelTransferCompletionObserver 27 class AsyncPixelTransferCompletionObserver
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl( 102 virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl(
114 gles2::TextureRef* ref, 103 gles2::TextureRef* ref,
115 const AsyncTexImage2DParams& define_params) = 0; 104 const AsyncTexImage2DParams& define_params) = 0;
116 105
117 DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferManager); 106 DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferManager);
118 }; 107 };
119 108
120 } // namespace gpu 109 } // namespace gpu
121 110
122 #endif // GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_ 111 #endif // GPU_COMMAND_BUFFER_SERVICE_ASYNC_PIXEL_TRANSFER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698