Changeset 70084 in webkit

Timestamp:

Oct 19, 2010 2:11:24 PM (14 years ago)

Author:

jer.noble@apple.com

Message:

Windows: Implement 'preload=none'
​https://bugs.webkit.org/show_bug.cgi?id=47317
<rdar://problem/7718442>

Reviewed by Eric Carlson.

WebCore:

Implement the 'preload=none' identically to the mac implementation. Add three new
ivars: m_preload, m_delayLoad and m_movieURL; and override the MediaPlayerPrivate
functions: prepareToPlay() and setPreload().

• platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:

(WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):

Initialize new ivars m_delayLoad and m_preload.

(WebCore::MediaPlayerPrivateQuickTimeVisualContext::resumeLoad): Added; new.
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::load): Split contents between

load and loadInternal.

(WebCore::MediaPlayerPrivateQuickTimeVisualContext::loadInternal): Added; new.
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::prepareToPlay): Added; overrides MediaPlayerPrivate.
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::setPreload): Added; overrides MediaPlayerPrivate.

• platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:

LayoutTests:

Do not skip the media/video-preload.html test on windows any longer.

• platform/win/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (modified) (4 diffs)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-06  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        Windows: Implement 'preload=none'
+        https://bugs.webkit.org/show_bug.cgi?id=47317
+        <rdar://problem/7718442>
+        
+        Do not skip the media/video-preload.html test on windows any longer.
+
+        * platform/win/Skipped:
+
 2010-10-19  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/platform/win/Skipped

@@ -831 +831 @@
 fast/events/spatial-navigation
 
-# <rdar://problem/7718442> Implement 'preload=none'
-media/video-preload.html
-
 # For some reason crashes when run with all tests. Passes individually.
 fast/forms/multiple-form-submission-protection-mouse.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-06  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        Windows: Implement 'preload=none'
+        https://bugs.webkit.org/show_bug.cgi?id=47317
+        <rdar://problem/7718442>
+        
+        Implement the 'preload=none' identically to the mac implementation. Add three new
+        ivars: m_preload, m_delayLoad and m_movieURL; and override the MediaPlayerPrivate
+        functions: prepareToPlay() and setPreload().
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
+            Initialize new ivars m_delayLoad and m_preload.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::resumeLoad): Added; new.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::load): Split contents between
+            load and loadInternal.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::loadInternal): Added; new.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::prepareToPlay): Added; overrides MediaPlayerPrivate.
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::setPreload): Added; overrides MediaPlayerPrivate.
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+        
 2010-10-19  Enrica Casucci  <enrica@apple.com>
 

trunk/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

@@ -175 +175 @@
 #endif
     , m_visualContextClient(new MediaPlayerPrivateQuickTimeVisualContext::VisualContextClient(this))
+    , m_delayingLoad(false)
+    , m_preload(MediaPlayer::Auto)
 {
 }
@@ -317 +319 @@
 }
 
+void MediaPlayerPrivateQuickTimeVisualContext::resumeLoad()
+{
+    m_delayingLoad = false;
+
+    if (!m_movieURL.isEmpty())
+        loadInternal(m_movieURL);
+}
+
 void MediaPlayerPrivateQuickTimeVisualContext::load(const String& url)
+{
+    m_movieURL = url;
+
+    if (m_preload == MediaPlayer::None) {
+        m_delayingLoad = true;
+        return;
+    }
+
+    loadInternal(url);
+}
+
+void MediaPlayerPrivateQuickTimeVisualContext::loadInternal(const String& url)
 {
     if (!QTMovie::initializeQuickTime()) {
@@ -346 +368 @@
     m_movie->load(url.characters(), url.length(), m_player->preservesPitch());
     m_movie->setVolume(m_player->volume());
+}
+
+void MediaPlayerPrivateQuickTimeVisualContext::prepareToPlay()
+{
+    if (!m_movie || m_delayingLoad)
+        resumeLoad();
 }
 
@@ -1006 +1034 @@
 }
 
+void MediaPlayerPrivateQuickTimeVisualContext::setPreload(MediaPlayer::Preload preload)
+{
+    m_preload = preload;
+    if (m_delayingLoad && m_preload != MediaPlayer::None)
+        resumeLoad();
+}
+
 MediaPlayerPrivateQuickTimeVisualContext::MediaRenderingMode MediaPlayerPrivateQuickTimeVisualContext::currentRenderingMode() const
 {

trunk/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h

@@ -75 +75 @@
     void load(const String& url);
     void cancelLoad();
+    void loadInternal(const String& url);
+    void resumeLoad();
     
     void play();
     void pause();    
+    void prepareToPlay();
     
     bool paused() const;
@@ -111 +114 @@
     bool hasClosedCaptions() const;
     void setClosedCaptionsVisible(bool);
+
+    void setPreload(MediaPlayer::Preload);
 
     void updateStates();
@@ -190 +195 @@
     bool m_visible;
     bool m_newFrameAvailable;
+    bool m_delayingLoad;
+    String m_movieURL;
+    MediaPlayer::Preload m_preload;
 #if DRAW_FRAME_RATE
     double m_frameCountWhilePlaying;