From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 11 Aug 2010 14:44:44 +0100
Subject: Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
---
 WebKit/chromium/src/WebMediaPlayerClientImpl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebKit/chromium/src/WebMediaPlayerClientImpl.h')

diff --git a/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/WebKit/chromium/src/WebMediaPlayerClientImpl.h
index 0faac26..df179a8 100644
--- a/WebKit/chromium/src/WebMediaPlayerClientImpl.h
+++ b/WebKit/chromium/src/WebMediaPlayerClientImpl.h
@@ -70,7 +70,7 @@ public:
     virtual float volume() const;
 
     // MediaPlayerPrivateInterface methods:
-    virtual void load(const WebCore::String& url);
+    virtual void load(const WTF::String& url);
     virtual void cancelLoad();
 #if USE(ACCELERATED_COMPOSITING)
     virtual WebCore::PlatformLayer* platformLayer() const;
@@ -114,9 +114,9 @@ private:
     WebMediaPlayerClientImpl();
 
     static WebCore::MediaPlayerPrivateInterface* create(WebCore::MediaPlayer*);
-    static void getSupportedTypes(WTF::HashSet<WebCore::String>&);
+    static void getSupportedTypes(WTF::HashSet<WTF::String>&);
     static WebCore::MediaPlayer::SupportsType supportsType(
-        const WebCore::String& type, const WebCore::String& codecs);
+        const WTF::String& type, const WTF::String& codecs);
 
     WebCore::MediaPlayer* m_mediaPlayer;
     OwnPtr<WebMediaPlayer> m_webMediaPlayer;
-- 
cgit v1.1