WebKit Merge 40875:41017, Chromium side

R=tc
BUG=NONE

The changes are to account for:

http://trac.webkit.org/changeset/40925 -- Adding MediaPlayerPrivate
http://trac.webkit.org/changeset/40981 -- Converting GKURL constructor arg to CString.

Review URL: http://codereview.chromium.org/20409

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9860 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 1 deletions

diff --git a/webkit/glue/media_player_private_impl.cc b/webkit/glue/media_player_private_impl.cc
index 8e0060d..8fbef04 100644
--- a/webkit/glue/media_player_private_impl.cc
+++ b/webkit/glue/media_player_private_impl.cc
@@ -9,6 +9,7 @@
 #include "GraphicsContext.h"
 #include "IntRect.h"
 #include "MediaPlayerPrivateChromium.h"
+#include "NotImplemented.h"
 #include "PlatformContextSkia.h"
 #undef LOG
 
@@ -84,6 +85,25 @@ IntSize MediaPlayerPrivate::naturalSize() const {
   }
 }
 
+MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player)
+{
+    return new MediaPlayerPrivate(player);
+}
+
+void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+{
+    if (isAvailable())
+        registrar(create, getSupportedTypes, supportsType);
+}
+
+MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String &type, const String &codecs)
+{
+    // FIXME: Do the real thing
+    notImplemented();
+
+    return MediaPlayer::IsSupported;
+}
+
 bool MediaPlayerPrivate::hasVideo() const {
   if (m_data) {
     return AsDelegate(m_data)->IsVideo();
@@ -271,7 +291,7 @@ void MediaPlayerPrivate::paint(GraphicsContext* p, const IntRect& r) {
 
 // Called from WebMediaPlayer -------------------------------------------------
 FrameView* MediaPlayerPrivate::frameView() {
-  return m_player->m_frameView;
+  return m_player->frameView();
 }
 
 void MediaPlayerPrivate::networkStateChanged() {