Title: [218454] trunk/Source/WebCore
- Revision
- 218454
- Author
- [email protected]
- Date
- 2017-06-17 12:50:51 -0700 (Sat, 17 Jun 2017)
Log Message
Unreviewed, rolling out r218438.
https://bugs.webkit.org/show_bug.cgi?id=173515
Caused imported/w3c/web-platform-tests/media-
source/mediasource* tests to fail (Requested by smfr on
#webkit).
Reverted changeset:
"[MSE] Seeking or entering fullscreen can cause extreme CPU
usage"
https://bugs.webkit.org/show_bug.cgi?id=173505
http://trac.webkit.org/changeset/218438
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (218453 => 218454)
--- trunk/Source/WebCore/ChangeLog 2017-06-17 15:49:32 UTC (rev 218453)
+++ trunk/Source/WebCore/ChangeLog 2017-06-17 19:50:51 UTC (rev 218454)
@@ -1,3 +1,19 @@
+2017-06-17 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r218438.
+ https://bugs.webkit.org/show_bug.cgi?id=173515
+
+ Caused imported/w3c/web-platform-tests/media-
+ source/mediasource* tests to fail (Requested by smfr on
+ #webkit).
+
+ Reverted changeset:
+
+ "[MSE] Seeking or entering fullscreen can cause extreme CPU
+ usage"
+ https://bugs.webkit.org/show_bug.cgi?id=173505
+ http://trac.webkit.org/changeset/218438
+
2017-06-17 Antti Koivisto <[email protected]>
Crash due to infinite recursion via FrameSelection::updateAppearanceAfterLayout
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (218453 => 218454)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-06-17 15:49:32 UTC (rev 218453)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-06-17 19:50:51 UTC (rev 218454)
@@ -1002,13 +1002,9 @@
bool SourceBufferPrivateAVFObjC::isReadyForMoreSamples(const AtomicString& trackIDString)
{
int trackID = trackIDString.toInt();
- if (trackID == m_enabledVideoTrackID) {
- if (m_decompressionSession)
- return m_decompressionSession->isReadyForMoreMediaData();
+ if (trackID == m_enabledVideoTrackID)
+ return !m_decompressionSession || m_decompressionSession->isReadyForMoreMediaData();
- return [m_displayLayer isReadyForMoreMediaData];
- }
-
if (m_audioRenderers.contains(trackID))
return [m_audioRenderers.get(trackID) isReadyForMoreMediaData];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
