Diff
Modified: trunk/LayoutTests/ChangeLog (119977 => 119978)
--- trunk/LayoutTests/ChangeLog 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/LayoutTests/ChangeLog 2012-06-11 14:33:03 UTC (rev 119978)
@@ -1,3 +1,10 @@
+2012-06-11 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
[Qt] Gardening after r119962. Four inspector/debugger tests still fail after they have been re-enabled.
Deleted: trunk/LayoutTests/http/tests/media/video-src-invalid-error-expected.txt (119977 => 119978)
--- trunk/LayoutTests/http/tests/media/video-src-invalid-error-expected.txt 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/LayoutTests/http/tests/media/video-src-invalid-error-expected.txt 2012-06-11 14:33:03 UTC (rev 119978)
@@ -1,8 +0,0 @@
-Test that changing 'src' attribute to an invalid URL results in an error event.
-
-RUN(video.setAttribute('src', 'invalid-url'))
-
-EVENT(error)
-EXPECTED (video.error.code == '4') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/http/tests/media/video-src-invalid-error.html (119977 => 119978)
--- trunk/LayoutTests/http/tests/media/video-src-invalid-error.html 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/LayoutTests/http/tests/media/video-src-invalid-error.html 2012-06-11 14:33:03 UTC (rev 119978)
@@ -1,36 +0,0 @@
-<html>
- <head>
- <script src=""
-
- <script>
- function stalled()
- {
- failTest("stalled but should not");
- consoleWrite("");
- }
-
- function errorEvent()
- {
- testExpected("video.error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED);
- endTest();
- }
-
- function setup()
- {
- findMediaElement();
- waitForEvent('stalled', stalled);
- waitForEvent('error', errorEvent);
- run("video.setAttribute('src', 'invalid-url')");
- consoleWrite("");
- }
-
- </script>
- </head>
-<body _onload_="setup()">
-
- <video controls></video>
-
- <p>Test that changing 'src' attribute to an invalid URL results in an error event.</p>
-
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (119977 => 119978)
--- trunk/Source/WebCore/ChangeLog 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/Source/WebCore/ChangeLog 2012-06-11 14:33:03 UTC (rev 119978)
@@ -1,3 +1,16 @@
+2012-06-11 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
[Qt] Add config tests for WEBP imagedecoder library, modify HAVE(decoderlibrary) to USE(...)$
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (119977 => 119978)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-06-11 14:33:03 UTC (rev 119978)
@@ -665,7 +665,7 @@
// Perform the cleanup required for the resource load algorithm to run.
stopPeriodicTimers();
- stopLoadTimer(MediaResource);
+ m_loadTimer.stop();
m_sentEndEvent = false;
m_sentStalledEvent = false;
m_haveFiredLoadedData = false;
@@ -3715,14 +3715,6 @@
m_playbackProgressTimer.stop();
}
-void HTMLMediaElement::stopLoadTimer(PendingLoadFlags flags)
-{
- m_pendingLoadFlags &= ~flags;
-
- if (!m_pendingLoadFlags)
- m_loadTimer.stop();
-}
-
void HTMLMediaElement::userCancelledLoad()
{
LOG(Media, "HTMLMediaElement::userCancelledLoad");
@@ -3737,8 +3729,9 @@
m_player.clear();
#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.
m_error = MediaError::create(MediaError::MEDIA_ERR_ABORTED);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (119977 => 119978)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2012-06-11 14:33:03 UTC (rev 119978)
@@ -439,9 +439,6 @@
void startProgressEventTimer();
void stopPeriodicTimers();
- typedef unsigned PendingLoadFlags;
- void stopLoadTimer(PendingLoadFlags);
-
void seek(float time, ExceptionCode&);
void finishSeek();
void checkIfSeekNeeded();
@@ -603,6 +600,7 @@
double m_fragmentStartTime;
double m_fragmentEndTime;
+ typedef unsigned PendingLoadFlags;
PendingLoadFlags m_pendingLoadFlags;
bool m_playing : 1;
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (119977 => 119978)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-06-11 14:05:59 UTC (rev 119977)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-06-11 14:33:03 UTC (rev 119978)
@@ -97,7 +97,6 @@
SOFT_LINK_POINTER(QTKit, QTMovieApertureModeClean, NSString *)
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 *)
@@ -123,7 +122,6 @@
#define QTMovieLoadStateAttribute getQTMovieLoadStateAttribute()
#define QTMovieLoadStateDidChangeNotification getQTMovieLoadStateDidChangeNotification()
#define QTMovieNaturalSizeAttribute getQTMovieNaturalSizeAttribute()
-#define QTMovieOpenAsyncRequiredAttribute getQTMovieOpenAsyncRequiredAttribute()
#define QTMovieCurrentSizeAttribute getQTMovieCurrentSizeAttribute()
#define QTMoviePreventExternalURLLinksAttribute getQTMoviePreventExternalURLLinksAttribute()
#define QTMovieRateChangesPreservePitchAttribute getQTMovieRateChangesPreservePitchAttribute()
@@ -256,9 +254,6 @@
} else
[movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTSecurityPolicyNoCrossSiteAttribute];
- if (QTMovieOpenAsyncRequiredAttribute)
- [movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:QTMovieOpenAsyncRequiredAttribute];
-
if (m_preload < MediaPlayer::Auto)
[movieAttributes setValue:[NSNumber numberWithBool:YES] forKey:@"QTMovieLimitReadAheadAttribute"];
