| commit | 789ce688b3c7c1f6dd0cddd9f993583cb3fcd6c4 | [log] [tgz] |
|---|---|---|
| author | Lucas Forschler <lforschler@apple.com> | Fri Jun 17 00:51:01 2011 |
| committer | Lucas Forschler <lforschler@apple.com> | Fri Jun 17 00:51:01 2011 |
| tree | ec11a9ec0300d75a6cd4e15379a931d85ea3f746 | |
| parent | bf43294e69fbf2ce2266e57b2bd45dc202fd6c37 [diff] |
Rollout 89080 (88945). Canonical link: https://commits.webkit.org/76367.195@safari-534-branch git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-534-branch@89093 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 31e6542..975ad55 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,9 @@ 2011-06-14 Lucas Forschler <lforschler@apple.com> + Rolled out 89080. + +2011-06-14 Lucas Forschler <lforschler@apple.com> + Merged 88984. 2011-06-15 Sam Weinig <sam@webkit.org>
diff --git a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm index 4ce2288..0eec933 100644 --- a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm +++ b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationObjC.mm
@@ -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();