Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4

* changes:
  Merge WebKit at r65615 : Update WebKit revision number
  Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
  Merge WebKit at r65615 : Android-specific results for Geolocation tests.
  Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
  Merge WebKit at r65615 : processingUserGesture() is now static.
  Merge WebKit at r65615 : UTF8String() becomes utf8().
  Merge WebKit at r65615 : Fix include paths for string headers.
  Merge WebKit at r65615 : Fix Makefiles.
  Merge WebKit at r65615 : Fix conflicts.
  Merge WebKit at r65615 : Initial merge by git.

1 files changed, 10 insertions, 0 deletions

diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index d72404c..165efde 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -50,10 +50,13 @@ public:
     bool hasAudio() const;
 
     void load(const String &url);
+    void commitLoad(const String& url);
+    void resumeLoad();
     void cancelLoad();
 
     void play();
     void pause();
+    void prepareToPlay();
 
     bool paused() const;
     bool seeking() const;
@@ -68,6 +71,8 @@ public:
     bool supportsMuting() const;
     void setMuted(bool);
 
+    void setPreload(MediaPlayer::Preload);
+
     MediaPlayer::NetworkState networkState() const;
     MediaPlayer::ReadyState readyState() const;
 
@@ -103,6 +108,7 @@ private slots:
     void seekTimeout();
     void positionChanged(qint64);
     void durationChanged(qint64);
+    void bufferStatusChanged(int);
     void volumeChanged(int);
     void mutedChanged(bool);
     void repaint();
@@ -127,6 +133,10 @@ private:
     bool m_isSeeking;
     bool m_composited;
     qint64 m_queuedSeek;
+    MediaPlayer::Preload m_preload;
+    bool m_delayingLoad;
+    String m_mediaUrl;
+
 };
 }