| Index: gpu/ipc/service/stream_texture_android.h
|
| diff --git a/content/common/gpu/stream_texture_android.h b/gpu/ipc/service/stream_texture_android.h
|
| similarity index 90%
|
| rename from content/common/gpu/stream_texture_android.h
|
| rename to gpu/ipc/service/stream_texture_android.h
|
| index e19fc1b321a23cff8c83892b195c7517fa2113e7..9d53d18f9652263c8063f8bff2996c493bb82ab5 100644
|
| --- a/content/common/gpu/stream_texture_android.h
|
| +++ b/gpu/ipc/service/stream_texture_android.h
|
| @@ -2,14 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
|
| -#define CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
|
| +#ifndef GPU_IPC_SERVICE_STREAM_TEXTURE_ANDROID_H_
|
| +#define GPU_IPC_SERVICE_STREAM_TEXTURE_ANDROID_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "content/common/gpu/gpu_command_buffer_stub.h"
|
| +#include "gpu/command_buffer/service/gl_stream_texture_image.h"
|
| +#include "gpu/ipc/service/gpu_command_buffer_stub.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ui/gl/android/surface_texture.h"
|
| #include "ui/gl/gl_image.h"
|
| @@ -22,7 +23,7 @@ namespace gfx {
|
| class Size;
|
| }
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| class StreamTexture : public gl::GLImage,
|
| public IPC::Listener,
|
| @@ -105,6 +106,6 @@ class StreamTexture : public gl::GLImage,
|
| DISALLOW_COPY_AND_ASSIGN(StreamTexture);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|
| -#endif // CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
|
| +#endif // GPU_IPC_SERVICE_STREAM_TEXTURE_ANDROID_H_
|
|
|