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

Unified Diff: content/renderer/media/webmediaplayer_ms.h

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/webkit/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
similarity index 94%
rename from webkit/renderer/media/webmediaplayer_ms.h
rename to content/renderer/media/webmediaplayer_ms.h
index d428cb6777f0111b44ee550068062710339f2d3a..0769845f56a59208687b111e6c95305b4b0daaa6 100644
--- a/webkit/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.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 WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "cc/layers/video_frame_provider.h"
+#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
#include "media/filters/skcanvas_video_renderer.h"
#include "skia/ext/platform_canvas.h"
@@ -28,8 +29,7 @@ namespace webkit {
class WebLayerImpl;
}
-namespace webkit_media {
-
+namespace content {
class MediaStreamAudioRenderer;
class MediaStreamClient;
class VideoFrameProvider;
@@ -49,7 +49,7 @@ class WebMediaPlayerDelegate;
//
// WebKit::WebMediaPlayerClient
// WebKit client of this media player object.
-class WebMediaPlayerMS
+class CONTENT_EXPORT WebMediaPlayerMS
: public WebKit::WebMediaPlayer,
public cc::VideoFrameProvider,
public base::SupportsWeakPtr<WebMediaPlayerMS> {
@@ -153,7 +153,7 @@ class WebMediaPlayerMS
base::WeakPtr<WebMediaPlayerDelegate> delegate_;
MediaStreamClient* media_stream_client_;
- scoped_refptr<webkit_media::VideoFrameProvider> video_frame_provider_;
+ scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
bool paused_;
// |current_frame_| is updated only on main thread. The object it holds
@@ -187,6 +187,6 @@ class WebMediaPlayerMS
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
};
-} // namespace webkit_media
+} // namespace content
-#endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
+#endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_

Powered by Google App Engine
This is Rietveld 408576698