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

Unified Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 470983004: Move blink<->cc bindings to cc/blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
Index: content/renderer/media/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index c994b52dce49f85606ca49cb117807fa33f63c3e..6f74ae5c41a24353e06da73e516da78ff9015365 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -45,6 +45,10 @@ class WebFrame;
class WebURL;
}
+namespace cc_blink {
+class WebLayerImpl;
+}
+
namespace gpu {
struct MailboxHolder;
}
@@ -57,7 +61,6 @@ namespace content {
class RendererCdmManager;
class RendererMediaPlayerManager;
class WebContentDecryptionModuleImpl;
-class WebLayerImpl;
class WebMediaPlayerDelegate;
// This class implements blink::WebMediaPlayer by keeping the android
@@ -414,7 +417,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
// not NULL while the compositor is actively using this webmediaplayer.
cc::VideoFrameProvider::Client* video_frame_provider_client_;
- scoped_ptr<WebLayerImpl> video_weblayer_;
+ scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
#if defined(VIDEO_HOLE)
// A rectangle represents the geometry of video frame, when computed last
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698