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

Unified Diff: content/common/gpu/gpu_channel.h

Issue 23125008: Revert 217691 "Merge 217276 "Add media::VideoEncodeAccelerator w..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/
Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/client/gpu_video_encode_accelerator_host.cc ('k') | content/common/gpu/gpu_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel.h
===================================================================
--- content/common/gpu/gpu_channel.h (revision 218293)
+++ content/common/gpu/gpu_channel.h (working copy)
@@ -11,7 +11,6 @@
#include "base/id_map.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process.h"
#include "build/build_config.h"
@@ -50,10 +49,9 @@
namespace content {
class GpuChannelManager;
-class GpuChannelMessageFilter;
struct GpuRenderingStats;
-class GpuVideoEncodeAccelerator;
class GpuWatchdog;
+class GpuChannelMessageFilter;
// Encapsulates an IPC channel between the GPU process and one renderer
// process. On the renderer side there's a corresponding GpuChannelHost.
@@ -175,8 +173,6 @@
const GPUCreateCommandBufferConfig& init_params,
int32* route_id);
void OnDestroyCommandBuffer(int32 route_id);
- void OnCreateVideoEncoder(int32* route_id);
- void OnDestroyVideoEncoder(int32 route_id);
#if defined(OS_ANDROID)
// Register the StreamTextureProxy class with the gpu process so that all
@@ -242,9 +238,6 @@
StubMap stubs_;
#endif // defined (ENABLE_GPU)
- typedef IDMap<GpuVideoEncodeAccelerator, IDMapOwnPointer> EncoderMap;
- EncoderMap video_encoders_;
-
bool log_messages_; // True if we should log sent and received messages.
gpu::gles2::DisallowedFeatures disallowed_features_;
GpuWatchdog* watchdog_;
« no previous file with comments | « content/common/gpu/client/gpu_video_encode_accelerator_host.cc ('k') | content/common/gpu/gpu_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698