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

Side by Side Diff: content/common/gpu/client/command_buffer_proxy_impl.h

Issue 9904005: PpapiCommandBufferProxy implements CommandBufferProxy. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed obsolete ENABLE_GPU def from CommandBufferProxy Created 8 years, 8 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 | Annotate | Revision Log
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 #ifndef CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ 5 #ifndef CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
6 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ 6 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #if defined(ENABLE_GPU) 9 #if defined(ENABLE_GPU)
10 10
11 #include <map> 11 #include <map>
12 #include <queue> 12 #include <queue>
13 #include <string> 13 #include <string>
14 14
15 #include "content/common/gpu/client/command_buffer_proxy.h" 15 #include "gpu/ipc/command_buffer_proxy.h"
16 16
17 #include "base/callback.h" 17 #include "base/callback.h"
18 #include "base/memory/linked_ptr.h" 18 #include "base/memory/linked_ptr.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
21 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" 21 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
22 #include "gpu/command_buffer/common/command_buffer.h" 22 #include "gpu/command_buffer/common/command_buffer.h"
23 #include "gpu/command_buffer/common/command_buffer_shared.h" 23 #include "gpu/command_buffer/common/command_buffer_shared.h"
24 #include "ipc/ipc_channel.h" 24 #include "ipc/ipc_channel.h"
25 #include "ipc/ipc_message.h" 25 #include "ipc/ipc_message.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 memory_allocation_changed_callback_; 145 memory_allocation_changed_callback_;
146 146
147 GpuConsoleMessageCallback console_message_callback_; 147 GpuConsoleMessageCallback console_message_callback_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl); 149 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl);
150 }; 150 };
151 151
152 #endif // ENABLE_GPU 152 #endif // ENABLE_GPU
153 153
154 #endif // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ 154 #endif // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698