| Index: content/renderer/media/android/stream_texture_factory_android.h
|
| diff --git a/webkit/renderer/media/android/stream_texture_factory_android.h b/content/renderer/media/android/stream_texture_factory_android.h
|
| similarity index 88%
|
| rename from webkit/renderer/media/android/stream_texture_factory_android.h
|
| rename to content/renderer/media/android/stream_texture_factory_android.h
|
| index a9aab0e6f4e58aa301fe8ff025a2848d80b93738..5f04877457492760a6fa32314b582870366ec0fd 100644
|
| --- a/webkit/renderer/media/android/stream_texture_factory_android.h
|
| +++ b/content/renderer/media/android/stream_texture_factory_android.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
| -#define WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
| +#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/layers/video_frame_provider.h"
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| // The proxy class for the gpu thread to notify the compositor thread
|
| // when a new video frame is available.
|
| @@ -59,6 +59,6 @@ class StreamTextureFactory {
|
| virtual void DestroyStreamTexture(unsigned texture_id) = 0;
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
|
|
|