Title: [107002] trunk/Source/WebCore
- Revision
- 107002
- Author
- [email protected]
- Date
- 2012-02-07 15:53:02 -0800 (Tue, 07 Feb 2012)
Log Message
media/audio-data-url.html test broken on Lion
https://bugs.webkit.org/show_bug.cgi?id=69779
Reviewed by Eric Carlson.
Do not use "OpenForPlayback" attribute on data:// urls, as CoreMedia/QuickTime X cannot
handle those URLs.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::createQTMovie):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107001 => 107002)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 23:47:59 UTC (rev 107001)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 23:53:02 UTC (rev 107002)
@@ -1,3 +1,16 @@
+2011-10-10 Jer Noble <[email protected]>
+
+ media/audio-data-url.html test broken on Lion
+ https://bugs.webkit.org/show_bug.cgi?id=69779
+
+ Reviewed by Eric Carlson.
+
+ Do not use "OpenForPlayback" attribute on data:// urls, as CoreMedia/QuickTime X cannot
+ handle those URLs.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::createQTMovie):
+
2012-02-07 Anders Carlsson <[email protected]>
Scrolling tree should keep track of region we can't do fast scrolling for
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (107001 => 107002)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-02-07 23:47:59 UTC (rev 107001)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-02-07 23:53:02 UTC (rev 107002)
@@ -259,7 +259,8 @@
void MediaPlayerPrivateQTKit::createQTMovie(const String& url)
{
- NSURL *cocoaURL = KURL(ParsedURLString, url);
+ KURL kURL(ParsedURLString, url);
+ NSURL *cocoaURL = kURL;
NSMutableDictionary *movieAttributes = commonMovieAttributes();
[movieAttributes setValue:cocoaURL forKey:QTMovieURLAttribute];
@@ -282,9 +283,9 @@
willUseProxy = NO;
}
- if (!willUseProxy) {
+ if (!willUseProxy && !kURL.protocolIsData()) {
// Only pass the QTMovieOpenForPlaybackAttribute flag if there are no proxy servers, due
- // to rdar://problem/7531776.
+ // to rdar://problem/7531776, or if not loading a data:// url due to rdar://problem/8103801.
[movieAttributes setObject:[NSNumber numberWithBool:YES] forKey:@"QTMovieOpenForPlaybackAttribute"];
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes