Changeset 141630 in webkit
- Timestamp:
- Feb 1, 2013 12:44:28 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r141625 r141630 1 2013-02-01 Jer Noble <jer.noble@apple.com> 2 3 REGRESSION (r141281): Navigating to this HTTP Live Streaming (application/vnd.apple.mpegurl) URL downloads a file instead of playing it in the browser 4 https://bugs.webkit.org/show_bug.cgi?id=108674 5 <rdar://problem/13133595> 6 7 Reviewed by Eric Carlson. 8 9 When passed a HashSet of available MIME types to fill out, QTKit was overwriting the contents, which were 10 AVFoundation's supported types. Instead, it should be appending to the list of supported types. 11 12 * platform/graphics/mac/MediaPlayerPrivateQTKit.mm: 13 (WebCore::concatenateHashSets): Added static utility function. 14 (WebCore::MediaPlayerPrivateQTKit::getSupportedTypes): Concatenate instead of overwriting the passed in MIME types. 15 1 16 2013-02-01 Beth Dakin <bdakin@apple.com> 2 17 -
trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
r141281 r141630 1517 1517 1518 1518 return cache; 1519 } 1519 } 1520 1521 static void concatenateHashSets(HashSet<String>& destination, const HashSet<String>& source) 1522 { 1523 HashSet<String>::const_iterator it = source.begin(); 1524 HashSet<String>::const_iterator end = source.end(); 1525 for (; it != end; ++it) 1526 destination.add(*it); 1527 } 1520 1528 1521 1529 void MediaPlayerPrivateQTKit::getSupportedTypes(HashSet<String>& supportedTypes) 1522 1530 { 1523 supportedTypes = mimeModernTypesCache();1524 1531 concatenateHashSets(supportedTypes, mimeModernTypesCache()); 1532 1525 1533 // Note: this method starts QTKitServer if it isn't already running when in 64-bit because it has to return the list 1526 1534 // of every MIME type supported by QTKit. 1527 HashSet<String> commonTypes = mimeCommonTypesCache(); 1528 HashSet<String>::const_iterator it = commonTypes.begin(); 1529 HashSet<String>::const_iterator end = commonTypes.end(); 1530 for (; it != end; ++it) 1531 supportedTypes.add(*it); 1532 } 1535 concatenateHashSets(supportedTypes, mimeCommonTypesCache()); 1536 } 1533 1537 1534 1538 MediaPlayer::SupportsType MediaPlayerPrivateQTKit::supportsType(const String& type, const String& codecs, const KURL&)
Note: See TracChangeset
for help on using the changeset viewer.