Changeset 141630 in webkit

Timestamp:

Feb 1, 2013 12:44:28 PM (11 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION (r141281): Navigating to this HTTP Live Streaming (application/vnd.apple.mpegurl) URL downloads a file instead of playing it in the browser
​https://bugs.webkit.org/show_bug.cgi?id=108674
<rdar://problem/13133595>

Reviewed by Eric Carlson.

When passed a HashSet of available MIME types to fill out, QTKit was overwriting the contents, which were
AVFoundation's supported types. Instead, it should be appending to the list of supported types.

• platform/graphics/mac/MediaPlayerPrivateQTKit.mm:

(WebCore::concatenateHashSets): Added static utility function.
(WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): Concatenate instead of overwriting the passed in MIME types.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION (r141281): Navigating to this HTTP Live Streaming (application/vnd.apple.mpegurl) URL downloads a file instead of playing it in the browser
+        https://bugs.webkit.org/show_bug.cgi?id=108674
+        <rdar://problem/13133595>
+
+        Reviewed by Eric Carlson.
+
+        When passed a HashSet of available MIME types to fill out, QTKit was overwriting the contents, which were
+        AVFoundation's supported types. Instead, it should be appending to the list of supported types.
+
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::concatenateHashSets): Added static utility function.
+        (WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): Concatenate instead of overwriting the passed in MIME types.
+
 2013-02-01  Beth Dakin  <bdakin@apple.com>
 

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

@@ -1517 +1517 @@
     
     return cache;
-} 
+}
+
+static void concatenateHashSets(HashSet<String>& destination, const HashSet<String>& source)
+{
+    HashSet<String>::const_iterator it = source.begin();
+    HashSet<String>::const_iterator end = source.end();
+    for (; it != end; ++it)
+        destination.add(*it);
+}
 
 void MediaPlayerPrivateQTKit::getSupportedTypes(HashSet<String>& supportedTypes)
 {
-    supportedTypes = mimeModernTypesCache();
-    
+    concatenateHashSets(supportedTypes, mimeModernTypesCache());
+
     // Note: this method starts QTKitServer if it isn't already running when in 64-bit because it has to return the list 
     // of every MIME type supported by QTKit.
-    HashSet<String> commonTypes = mimeCommonTypesCache();
-    HashSet<String>::const_iterator it = commonTypes.begin();
-    HashSet<String>::const_iterator end = commonTypes.end();
-    for (; it != end; ++it)
-        supportedTypes.add(*it);
-} 
+    concatenateHashSets(supportedTypes, mimeCommonTypesCache());
+}
 
 MediaPlayer::SupportsType MediaPlayerPrivateQTKit::supportsType(const String& type, const String& codecs, const KURL&)