Changeset 119978 in webkit

Timestamp:

Jun 11, 2012, 7:33:03 AM (13 years ago)

Author:

mitz@apple.com

Message:

Reverted r119940 because it caused multiple media tests to fail on Lion.

Source/WebCore:

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::prepareForLoad):
(WebCore):
(WebCore::HTMLMediaElement::userCancelledLoad):

• html/HTMLMediaElement.h:

(HTMLMediaElement):

• platform/graphics/mac/MediaPlayerPrivateQTKit.mm:

(WebCore::MediaPlayerPrivateQTKit::commonMovieAttributes):

LayoutTests:

• http/tests/media/video-src-invalid-error-expected.txt: Removed.
• http/tests/media/video-src-invalid-error.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/video-src-invalid-error-expected.txt (deleted)
• LayoutTests/http/tests/media/video-src-invalid-error.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-11  Dan Bernstein  <mitz@apple.com>
+
+        Reverted r119940 because it caused multiple media tests to fail on Lion.
+
+        * http/tests/media/video-src-invalid-error-expected.txt: Removed.
+        * http/tests/media/video-src-invalid-error.html: Removed.
+
 2012-06-11  János Badics  <jbadics@inf.u-szeged.hu>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-11  Dan Bernstein  <mitz@apple.com>
+
+        Reverted r119940 because it caused multiple media tests to fail on Lion.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::prepareForLoad):
+        (WebCore):
+        (WebCore::HTMLMediaElement::userCancelledLoad):
+        * html/HTMLMediaElement.h:
+        (HTMLMediaElement):
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::commonMovieAttributes):
+
 2012-06-11  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -666 +666 @@
     // Perform the cleanup required for the resource load algorithm to run.
     stopPeriodicTimers();
-    stopLoadTimer(MediaResource);
+    m_loadTimer.stop();
     m_sentEndEvent = false;
     m_sentStalledEvent = false;
@@ -3716 +3716 @@
 }
 
-void HTMLMediaElement::stopLoadTimer(PendingLoadFlags flags)
-{
-    m_pendingLoadFlags &= ~flags;
-
-    if (!m_pendingLoadFlags)
-        m_loadTimer.stop();
-}
-
 void HTMLMediaElement::userCancelledLoad()
 {
@@ -3738 +3730 @@
 #endif
     stopPeriodicTimers();
-    stopLoadTimer(MediaResource | TextTrackResource);
+    m_loadTimer.stop();
     m_loadState = WaitingForSource;
+    m_pendingLoadFlags = 0;
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_ABORTED.

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -440 +440 @@
     void stopPeriodicTimers();
 
-    typedef unsigned PendingLoadFlags;
-    void stopLoadTimer(PendingLoadFlags);
-
     void seek(float time, ExceptionCode&);
     void finishSeek();
@@ -604 +601 @@
     double m_fragmentEndTime;
 
+    typedef unsigned PendingLoadFlags;
     PendingLoadFlags m_pendingLoadFlags;
 

trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -98 +98 @@
 SOFT_LINK_POINTER(QTKit, QTMovieApertureModeAttribute, NSString *)
 
-SOFT_LINK_POINTER_OPTIONAL(QTKit, QTMovieOpenAsyncRequiredAttribute, NSString *)
 SOFT_LINK_POINTER_OPTIONAL(QTKit, QTSecurityPolicyNoLocalToRemoteSiteAttribute, NSString *)
 SOFT_LINK_POINTER_OPTIONAL(QTKit, QTSecurityPolicyNoRemoteToLocalSiteAttribute, NSString *)
@@ -124 +123 @@
 #define QTMovieLoadStateDidChangeNotification getQTMovieLoadStateDidChangeNotification()
 #define QTMovieNaturalSizeAttribute getQTMovieNaturalSizeAttribute()
-#define QTMovieOpenAsyncRequiredAttribute getQTMovieOpenAsyncRequiredAttribute()
 #define QTMovieCurrentSizeAttribute getQTMovieCurrentSizeAttribute()
 #define QTMoviePreventExternalURLLinksAttribute getQTMoviePreventExternalURLLinksAttribute()
@@ -256 +254 @@
     } else
         [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTSecurityPolicyNoCrossSiteAttribute];
-
-    if (QTMovieOpenAsyncRequiredAttribute)
-        [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTMovieOpenAsyncRequiredAttribute];
 
     if (m_preload < MediaPlayer::Auto)