Title: [89093] branches/safari-534-branch/Source/WebCore
- Revision
- 89093
- Author
- [email protected]
- Date
- 2011-06-16 17:51:01 -0700 (Thu, 16 Jun 2011)
Log Message
Rollout 89080 (88945).
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (89092 => 89093)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-17 00:29:41 UTC (rev 89092)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-17 00:51:01 UTC (rev 89093)
@@ -1,5 +1,9 @@
2011-06-14 Lucas Forschler <[email protected]>
+ Rolled out 89080.
+
+2011-06-14 Lucas Forschler <[email protected]>
+
Merged 88984.
2011-06-15 Sam Weinig <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm (89092 => 89093)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-17 00:29:41 UTC (rev 89092)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm 2011-06-17 00:51:01 UTC (rev 89093)
@@ -440,12 +440,8 @@
if (CMTIME_IS_NUMERIC(cmDuration))
return narrowPrecisionToFloat(CMTimeGetSeconds(cmDuration));
- if (CMTIME_IS_INDEFINITE(cmDuration)) {
- if (![[m_avAsset.get() tracks] count])
- return 0;
- else
- return numeric_limits<float>::infinity();
- }
+ if (CMTIME_IS_INDEFINITE(cmDuration))
+ return numeric_limits<float>::infinity();
LOG(Media, "MediaPlayerPrivateAVFoundationObjC::platformDuration(%p) - invalid duration, returning %.0f", this, invalidTime());
return invalidTime();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
