Title: [153945] trunk/Source/WebCore
- Revision
- 153945
- Author
- [email protected]
- Date
- 2013-08-12 09:49:56 -0700 (Mon, 12 Aug 2013)
Log Message
Revert r153912 because it broke some track tests.
Rubber-stamped by Antti Koivisto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged):
(WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153944 => 153945)
--- trunk/Source/WebCore/ChangeLog 2013-08-12 16:36:01 UTC (rev 153944)
+++ trunk/Source/WebCore/ChangeLog 2013-08-12 16:49:56 UTC (rev 153945)
@@ -1,23 +1,13 @@
-2013-08-12 [email protected] <[email protected]>
+2013-08-12 Eric Carlson <[email protected]>
- [Curl] Crash when starting second download.
- https://bugs.webkit.org/show_bug.cgi?id=119620
+ Revert r153912 because it broke some track tests.
- Reviewed by Brent Fulgham.
+ Rubber-stamped by Antti Koivisto.
- When a second download is started, a crash sometimes occurs in Curl.
- This happens because the Curl easy handle is deleted and removed from the Curl multi handle twice.
- This is solved by adding an array to keep track of active downloads to avoid double deletion.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack):
- * platform/network/curl/CurlDownload.cpp:
- (WebCore::CurlDownloadManager::CurlDownloadManager): Removed active download count member.
- (WebCore::CurlDownloadManager::getActiveDownloadCount): Use active download array to return active download count.
- (WebCore::CurlDownloadManager::updateHandleList): Remove Curl handles before adding, in case Curl reuses handles.
- (WebCore::CurlDownloadManager::addToCurl): Add Curl handle to active download array.
- (WebCore::CurlDownloadManager::removeFromCurl): Check if Curl handle is in active download array to avoid double deletion.
- (WebCore::CurlDownloadManager::downloadThread): Removed active download count member.
- * platform/network/curl/CurlDownload.h: Added array of active downloads member, and removed download count member.
-
2013-08-12 Antti Koivisto <[email protected]>
Add ElementTraversal::next/previousSibling
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (153944 => 153945)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-08-12 16:36:01 UTC (rev 153944)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-08-12 16:49:56 UTC (rev 153945)
@@ -1045,7 +1045,7 @@
sizeChanged();
- if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
+ if (!primaryAudioTrackLanguage.isNull() && primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
player()->characteristicChanged();
}
@@ -1497,12 +1497,6 @@
AVAssetTrack *track = [tracks objectAtIndex:0];
NSString *language = [track extendedLanguageTag];
- // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full
- // RFC 4646 language tag so extendedLanguageTag returns NULL. In this case languageCode will return the
- // ISO 639-2/T language code so check it.
- if (!language)
- language = [track languageCode];
-
// Some legacy tracks have "und" as a language, treat that the same as no language at all.
if (language && ![language isEqualToString:@"und"]) {
m_languageOfPrimaryAudioTrack = language;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes