Changeset 252003 in webkit

Timestamp:

Nov 4, 2019 10:56:35 AM (4 years ago)

Author:

Chris Dumez

Message:

MediaRecorder should not prevent entering the back/forward cache
​https://bugs.webkit.org/show_bug.cgi?id=203093
<rdar://problem/56748870>

Reviewed by Eric Carlson.

Source/WebCore:

Let pages using MediaRecorder enter the back/forward cache. On suspension, we
stop recording and we queue an error event which will get dispatched upon
resuming.

Test: fast/history/page-cache-media-recorder.html

• Modules/mediarecorder/MediaRecorder.cpp:

(WebCore::MediaRecorder::document const):
(WebCore::MediaRecorder::suspend):
(WebCore::MediaRecorder::activeDOMObjectName const):
(WebCore::MediaRecorder::scheduleDeferredTask):
(WebCore::MediaRecorder::shouldPreventEnteringBackForwardCache_DEPRECATED const): Deleted.

• Modules/mediarecorder/MediaRecorder.h:

LayoutTests:

Add layout test coverage.

• fast/history/page-cache-media-recorder-expected.txt: Added.
• fast/history/page-cache-media-recorder.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/history/page-cache-media-recorder-expected.txt (added)
• LayoutTests/fast/history/page-cache-media-recorder.html (added)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp (modified) (4 diffs)
• Source/WebCore/Modules/mediarecorder/MediaRecorder.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-04  Chris Dumez  <cdumez@apple.com>
+
+        MediaRecorder should not prevent entering the back/forward cache
+        https://bugs.webkit.org/show_bug.cgi?id=203093
+        <rdar://problem/56748870>
+
+        Reviewed by Eric Carlson.
+
+        Add layout test coverage.
+
+        * fast/history/page-cache-media-recorder-expected.txt: Added.
+        * fast/history/page-cache-media-recorder.html: Added.
+
 2019-11-04  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -4237 +4237 @@
 imported/w3c/web-platform-tests/mediacapture-record [ Skip ]
 fast/mediacapturefromelement/CanvasCaptureMediaStream-imagebitmaprenderingcontext.html [ Skip ]
+fast/history/page-cache-media-recorder.html [ Skip ]
 http/wpt/mediarecorder [ Skip ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-04  Chris Dumez  <cdumez@apple.com>
+
+        MediaRecorder should not prevent entering the back/forward cache
+        https://bugs.webkit.org/show_bug.cgi?id=203093
+        <rdar://problem/56748870>
+
+        Reviewed by Eric Carlson.
+
+        Let pages using MediaRecorder enter the back/forward cache. On suspension, we
+        stop recording and we queue an error event which will get dispatched upon
+        resuming.
+
+        Test: fast/history/page-cache-media-recorder.html
+
+        * Modules/mediarecorder/MediaRecorder.cpp:
+        (WebCore::MediaRecorder::document const):
+        (WebCore::MediaRecorder::suspend):
+        (WebCore::MediaRecorder::activeDOMObjectName const):
+        (WebCore::MediaRecorder::scheduleDeferredTask):
+        (WebCore::MediaRecorder::shouldPreventEnteringBackForwardCache_DEPRECATED const): Deleted.
+        * Modules/mediarecorder/MediaRecorder.h:
+
 2019-11-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.cpp

@@ -36 +36 @@
 #include "MediaRecorderPrivate.h"
 #include "SharedBuffer.h"
+#include "WindowEventLoop.h"
 #include <wtf/IsoMallocInlines.h>
 
@@ -94 +95 @@
 }
 
+Document* MediaRecorder::document() const
+{
+    return downcast<Document>(scriptExecutionContext());
+}
+
 void MediaRecorder::stop()
 {
@@ -100 +106 @@
 }
 
+void MediaRecorder::suspend(ReasonForSuspension reason)
+{
+    if (reason != ReasonForSuspension::BackForwardCache)
+        return;
+
+    if (!m_isActive || state() == RecordingState::Inactive)
+        return;
+
+    stopRecordingInternal();
+
+    scheduleDeferredTask([this] {
+        dispatchEvent(MediaRecorderErrorEvent::create(eventNames().errorEvent, Exception { UnknownError, "MediaStream recording was interrupted"_s }));
+    });
+}
+
 const char* MediaRecorder::activeDOMObjectName() const
 {
     return "MediaRecorder";
-}
-
-bool MediaRecorder::shouldPreventEnteringBackForwardCache_DEPRECATED() const
-{
-    return true; // FIXME: We should do better here as this prevents entering BackForwardCache.
 }
 
@@ -197 +213 @@
 {
     ASSERT(function);
-    auto* scriptExecutionContext = this->scriptExecutionContext();
-    if (!scriptExecutionContext)
-        return;
-
-    scriptExecutionContext->postTask([protectedThis = makeRef(*this), function = WTFMove(function)] (auto&) {
+    auto* document = this->document();
+    if (!document)
+        return;
+
+    document->eventLoop().queueTask(TaskSource::Networking, *document, [pendingActivity = makePendingActivity(*this), function = WTFMove(function)] {
         function();
     });

trunk/Source/WebCore/Modules/mediarecorder/MediaRecorder.h

@@ -80 +80 @@
     Ref<Blob> createRecordingDataBlob();
 
+    Document* document() const;
+
     // EventTarget
     void refEventTarget() final { ref(); }
@@ -87 +89 @@
 
     // ActiveDOMObject API.
+    void suspend(ReasonForSuspension) final;
     void stop() final;
     const char* activeDOMObjectName() const final;
-    bool shouldPreventEnteringBackForwardCache_DEPRECATED() const final;
     
     void stopRecordingInternal();