Attachment 362023 Details for Bug 194655 – ROLLOUT of r241486

[patch] ROLLOUT of r241486

bug-194655-20190214090554.patch (text/plain), 23.99 KB, created by WebKit Commit Bot on 2019-02-14 09:05:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-02-14 09:05:55 PST

Size: 23.99 KB

patch

obsolete

>Subversion Revision: 241546
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 528249571921ee915166115fbcfbd0d6623d55de..2d952ccc9255aea46ce17dbe35811261a298b270 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-14  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241486.
>+        https://bugs.webkit.org/show_bug.cgi?id=194655
>+
>+        causing API failures in builds (Requested by ShawnRoberts on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "[Cocoa] Media elements will restart network buffering just
>+        before suspending"
>+        https://bugs.webkit.org/show_bug.cgi?id=193691
>+        https://trac.webkit.org/changeset/241486
>+
> 2019-02-14  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapse] Replaced boxes don't collapse through their margins
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 7c09d7d70012bcb20ce7051598996e6fde722a66..6fd94b3af071a2fdc0c87d3ed155b380c90c58d2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-14  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241486.
>+        https://bugs.webkit.org/show_bug.cgi?id=194655
>+
>+        causing API failures in builds (Requested by ShawnRoberts on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "[Cocoa] Media elements will restart network buffering just
>+        before suspending"
>+        https://bugs.webkit.org/show_bug.cgi?id=193691
>+        https://trac.webkit.org/changeset/241486
>+
> 2019-02-14  Youenn Fablet  <youenn@apple.com>
> 
>         Do not add a caches to its engine if the salt cannot be initialized
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 466becb90623da0ab0e30cf3919970c95fe52532..050555ba9491f47ca0bb4dfdaaa193d9ac54edf9 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -1738,18 +1738,6 @@ void Document::resumeAllMediaPlayback()
>     if (auto* platformMediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists())
>         platformMediaSessionManager->resumeAllMediaPlaybackForDocument(*this);
> }
>-
>-void Document::suspendAllMediaBuffering()
>-{
>-    if (auto* platformMediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists())
>-        platformMediaSessionManager->suspendAllMediaBufferingForDocument(*this);
>-}
>-
>-void Document::resumeAllMediaBuffering()
>-{
>-    if (auto* platformMediaSessionManager = PlatformMediaSessionManager::sharedManagerIfExists())
>-        platformMediaSessionManager->resumeAllMediaBufferingForDocument(*this);
>-}
> #endif
> 
> String Document::nodeName() const
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index d0314abe5c572179d5a71185342472521b9ece65..db8988dc3708520670e8e0c47ff9e7b9dcc4c037 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -1126,8 +1126,6 @@ public:
>     void stopAllMediaPlayback();
>     void suspendAllMediaPlayback();
>     void resumeAllMediaPlayback();
>-    void suspendAllMediaBuffering();
>-    void resumeAllMediaBuffering();
> #endif
> 
>     WEBCORE_EXPORT void setShouldCreateRenderers(bool);
>diff --git a/Source/WebCore/html/MediaElementSession.cpp b/Source/WebCore/html/MediaElementSession.cpp
>index 153415a6f86058b4660039745892d5bd4b663833..71ac9956883102752def4d877501226402645a6f 100644
>--- a/Source/WebCore/html/MediaElementSession.cpp
>+++ b/Source/WebCore/html/MediaElementSession.cpp
>@@ -379,9 +379,6 @@ bool MediaElementSession::dataBufferingPermitted() const
>     if (isSuspended())
>         return false;
> 
>-    if (bufferingSuspended())
>-        return false;
>-
>     if (state() == PlatformMediaSession::Playing)
>         return true;
> 
>@@ -788,23 +785,6 @@ void MediaElementSession::resetPlaybackSessionState()
>     addBehaviorRestriction(RequireUserGestureToControlControlsManager | RequirePlaybackToControlControlsManager);
> }
> 
>-void MediaElementSession::suspendBuffering()
>-{
>-    updateClientDataBuffering();
>-}
>-
>-void MediaElementSession::resumeBuffering()
>-{
>-    updateClientDataBuffering();
>-}
>-
>-bool MediaElementSession::bufferingSuspended() const
>-{
>-    if (auto* page = m_element.document().page())
>-        return page->mediaBufferingIsSuspended();
>-    return true;
>-}
>-
> bool MediaElementSession::allowsPictureInPicture() const
> {
>     return m_element.document().settings().allowsPictureInPictureMediaPlayback();
>diff --git a/Source/WebCore/html/MediaElementSession.h b/Source/WebCore/html/MediaElementSession.h
>index ce058c6e11fe441c18de0652681cbaa4198147e1..597ba27729acc8f2e2e78caf964f5fc808e2a01e 100644
>--- a/Source/WebCore/html/MediaElementSession.h
>+++ b/Source/WebCore/html/MediaElementSession.h
>@@ -101,10 +101,6 @@ public:
> 
>     void resetPlaybackSessionState() override;
> 
>-    void suspendBuffering() override;
>-    void resumeBuffering() override;
>-    bool bufferingSuspended() const;
>-
>     // Restrictions to modify default behaviors.
>     enum BehaviorRestrictionFlags : unsigned {
>         NoRestrictions = 0,
>diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
>index a40fb87ea525d805b94956126efabb5210ac24ea..690735d4f0cb20c702b2b7b47d48bb2a322e9276 100644
>--- a/Source/WebCore/page/Page.cpp
>+++ b/Source/WebCore/page/Page.cpp
>@@ -1764,36 +1764,6 @@ void Page::resumeAllMediaPlayback()
> #endif
> }
> 
>-void Page::suspendAllMediaBuffering()
>-{
>-#if ENABLE(VIDEO)
>-    ASSERT(!m_mediaBufferingIsSuspended);
>-    if (m_mediaBufferingIsSuspended)
>-        return;
>-    m_mediaBufferingIsSuspended = true;
>-
>-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
>-        if (auto* document = frame->document())
>-            document->suspendAllMediaBuffering();
>-    }
>-#endif
>-}
>-
>-void Page::resumeAllMediaBuffering()
>-{
>-#if ENABLE(VIDEO)
>-    ASSERT(m_mediaBufferingIsSuspended);
>-    if (!m_mediaBufferingIsSuspended)
>-        return;
>-    m_mediaBufferingIsSuspended = false;
>-
>-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
>-        if (auto* document = frame->document())
>-            document->resumeAllMediaBuffering();
>-    }
>-#endif
>-}
>-
> #if ENABLE(MEDIA_SESSION)
> void Page::handleMediaEvent(MediaEventType eventType)
> {
>diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
>index ff9275387d0c3c0d59f01f0bd03531d938a0b24a..9464a8ddaf07a543f0b868ab083649caff7204b7 100644
>--- a/Source/WebCore/page/Page.h
>+++ b/Source/WebCore/page/Page.h
>@@ -614,10 +614,7 @@ public:
>     WEBCORE_EXPORT void stopAllMediaPlayback();
>     WEBCORE_EXPORT void suspendAllMediaPlayback();
>     WEBCORE_EXPORT void resumeAllMediaPlayback();
>-    bool mediaPlaybackIsSuspended() const { return m_mediaPlaybackIsSuspended; }
>-    WEBCORE_EXPORT void suspendAllMediaBuffering();
>-    WEBCORE_EXPORT void resumeAllMediaBuffering();
>-    bool mediaBufferingIsSuspended() const { return m_mediaBufferingIsSuspended; }
>+    bool mediaPlaybackIsSuspended() { return m_mediaPlaybackIsSuspended; }
> 
> #if ENABLE(MEDIA_SESSION)
>     WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
>@@ -970,7 +967,6 @@ private:
> 
>     bool m_shouldEnableICECandidateFilteringByDefault { true };
>     bool m_mediaPlaybackIsSuspended { false };
>-    bool m_mediaBufferingIsSuspended { false };
> };
> 
> inline PageGroup& Page::group()
>diff --git a/Source/WebCore/platform/audio/PlatformMediaSession.h b/Source/WebCore/platform/audio/PlatformMediaSession.h
>index 87e192f4fe3faac8cd64d374eed72f40d83697b6..25c177990cf2613f25fe0ad00d8812429b6da0f2 100644
>--- a/Source/WebCore/platform/audio/PlatformMediaSession.h
>+++ b/Source/WebCore/platform/audio/PlatformMediaSession.h
>@@ -113,9 +113,6 @@ public:
> 
>     void pauseSession();
>     void stopSession();
>-
>-    virtual void suspendBuffering() { }
>-    virtual void resumeBuffering() { }
>     
> #if ENABLE(VIDEO)
>     uint64_t uniqueIdentifier() const;
>diff --git a/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp b/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>index b9b079d9e1fd7ffffc2085337a0331f1f277058d..2050c5e082f3381b671802f835b07ec54e48c5d4 100644
>--- a/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>+++ b/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp
>@@ -437,22 +437,6 @@ void PlatformMediaSessionManager::resumeAllMediaPlaybackForDocument(const Docume
>     });
> }
> 
>-void PlatformMediaSessionManager::suspendAllMediaBufferingForDocument(const Document& document)
>-{
>-    forEachSession([&] (PlatformMediaSession& session, size_t) {
>-        if (session.client().hostingDocument() == &document)
>-            session.suspendBuffering();
>-    });
>-}
>-
>-void PlatformMediaSessionManager::resumeAllMediaBufferingForDocument(const Document& document)
>-{
>-    forEachSession([&] (PlatformMediaSession& session, size_t) {
>-        if (session.client().hostingDocument() == &document)
>-            session.resumeBuffering();
>-    });
>-}
>-
> void PlatformMediaSessionManager::forEachSession(const Function<void(PlatformMediaSession&, size_t)>& predicate) const
> {
>     ++m_iteratingOverSessions;
>diff --git a/Source/WebCore/platform/audio/PlatformMediaSessionManager.h b/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>index b795ff264a3000e6084a47aee732fc2497da9c99..45c70520b7d9a32f6bd92ce78e3f6eff4f86d33a 100644
>--- a/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>+++ b/Source/WebCore/platform/audio/PlatformMediaSessionManager.h
>@@ -82,8 +82,6 @@ public:
> 
>     void suspendAllMediaPlaybackForDocument(const Document&);
>     void resumeAllMediaPlaybackForDocument(const Document&);
>-    void suspendAllMediaBufferingForDocument(const Document&);
>-    void resumeAllMediaBufferingForDocument(const Document&);
> 
>     enum SessionRestrictionFlags {
>         NoRestrictions = 0,
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index b63efb15c6a0792d68dd26ada975d63855b05f95..752a3a49bb388ca4f16d1b9f37ace03c178ce9ae 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -7146,18 +7146,6 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISe
>     return nil;
> }
> 
>-- (void)_processWillSuspendImminentlyForTesting
>-{
>-    if (_page)
>-        _page->process().sendProcessWillSuspendImminently();
>-}
>-
>-- (void)_processDidResumeForTesting
>-{
>-    if (_page)
>-        _page->process().sendProcessDidResume();
>-}
>-
> - (void)_denyNextUserMediaRequest
> {
> #if ENABLE(MEDIA_STREAM)
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>index 99fbd94845e832c2d579cae7186fc08fb3d8418f..185109962b92664c762241bb482f493ed61faf8b 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>@@ -548,9 +548,6 @@ typedef NS_OPTIONS(NSUInteger, _WKRectEdge) {
> @property (nonatomic, readonly) _WKInspector *_inspector WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> @property (nonatomic, readonly) _WKFrameHandle *_mainFrame WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
>-- (void)_processWillSuspendImminentlyForTesting;
>-- (void)_processDidResumeForTesting;
>-
> @end
> 
> #endif
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index 372e454ce702351d9193733006eb25bb4c2c3f95..ea80979621e8162c82d6207cc3e2b4681a5f216f 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -249,13 +249,6 @@ public:
>     void shutDown();
>     void maybeShutDown();
> 
>-    // ProcessThrottlerClient
>-    void sendProcessWillSuspendImminently() override;
>-    void sendPrepareToSuspend() override;
>-    void sendCancelPrepareToSuspend() override;
>-    void sendProcessDidResume() override;
>-    void didSetAssertionState(AssertionState) override;
>-
> protected:
>     static uint64_t generatePageID();
>     WebProcessProxy(WebProcessPool&, WebsiteDataStore&, IsPrewarmed);
>@@ -325,6 +318,13 @@ private:
>     void didChangeIsResponsive() override;
>     bool mayBecomeUnresponsive() override;
> 
>+    // ProcessThrottlerClient
>+    void sendProcessWillSuspendImminently() override;
>+    void sendPrepareToSuspend() override;
>+    void sendCancelPrepareToSuspend() override;
>+    void sendProcessDidResume() override;
>+    void didSetAssertionState(AssertionState) override;
>+
>     // Implemented in generated WebProcessProxyMessageReceiver.cpp
>     void didReceiveWebProcessProxyMessage(IPC::Connection&, IPC::Decoder&);
>     void didReceiveSyncWebProcessProxyMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>index 1029edc47ce909f520c5f46eb96fcac1c2b5aa18..331d5587819a6b5230ffe71bbffe2fc61774102f 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
>@@ -687,17 +687,6 @@ void WebPage::resumeAllMediaPlayback()
>     m_page->resumeAllMediaPlayback();
> }
> 
>-void WebPage::suspendAllMediaBuffering()
>-{
>-    m_page->suspendAllMediaBuffering();
>-}
>-
>-void WebPage::resumeAllMediaBuffering()
>-{
>-    m_page->resumeAllMediaBuffering();
>-}
>-
>-
> void WebPage::reinitializeWebPage(WebPageCreationParameters&& parameters)
> {
>     ASSERT(m_drawingArea);
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index c80c4b8096666adb06c1fb8039ff50c9fd4a86b1..ba949ba709f1519b1c860629bbf6ea9644be1e10 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -1148,9 +1148,6 @@ public:
>     bool requestDOMPasteAccess();
>     WebCore::IntRect rectForElementAtInteractionLocation() const;
> 
>-    void suspendAllMediaBuffering();
>-    void resumeAllMediaBuffering();
>-
> private:
>     WebPage(uint64_t pageID, WebPageCreationParameters&&);
> 
>diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
>index bc13103ed67345ba65aa2b8524074014faa92eba..2822050e4ab51a284912befc4d03ab252a0efdcf 100644
>--- a/Source/WebKit/WebProcess/WebProcess.cpp
>+++ b/Source/WebKit/WebProcess/WebProcess.cpp
>@@ -1379,10 +1379,6 @@ void WebProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shou
> {
>     SetForScope<bool> suspensionScope(m_isSuspending, true);
> 
>-#if ENABLE(VIDEO)
>-    suspendAllMediaBuffering();
>-#endif
>-
>     if (!m_suppressMemoryPressureHandler)
>         MemoryPressureHandler::singleton().releaseMemory(Critical::Yes, Synchronous::Yes);
> 
>@@ -1439,11 +1435,7 @@ void WebProcess::cancelPrepareToSuspend()
> #if PLATFORM(IOS_FAMILY)
>     accessibilityProcessSuspendedNotification(false);
> #endif
>-
>-#if ENABLE(VIDEO)
>-    resumeAllMediaBuffering();
>-#endif
>-
>+    
>     // If we've already finished cleaning up and sent ProcessReadyToSuspend, we
>     // shouldn't send DidCancelProcessSuspension; the UI process strictly expects one or the other.
>     if (!m_pageMarkingLayersAsVolatileCounter)
>@@ -1508,10 +1500,6 @@ void WebProcess::processDidResume()
> #if PLATFORM(IOS_FAMILY)
>     accessibilityProcessSuspendedNotification(false);
> #endif
>-
>-#if ENABLE(VIDEO)
>-    resumeAllMediaBuffering();
>-#endif
> }
> 
> void WebProcess::sendPrewarmInformation(const URL& url)
>@@ -1764,20 +1752,6 @@ void WebProcess::resetMockMediaDevices()
> }
> #endif
> 
>-#if ENABLE(VIDEO)
>-void WebProcess::suspendAllMediaBuffering()
>-{
>-    for (auto& page : m_pageMap.values())
>-        page->suspendAllMediaBuffering();
>-}
>-
>-void WebProcess::resumeAllMediaBuffering()
>-{
>-    for (auto& page : m_pageMap.values())
>-        page->resumeAllMediaBuffering();
>-}
>-#endif
>-
> void WebProcess::clearCurrentModifierStateForTesting()
> {
>     PlatformKeyboardEvent::setCurrentModifierState({ });
>diff --git a/Source/WebKit/WebProcess/WebProcess.h b/Source/WebKit/WebProcess/WebProcess.h
>index d98a7a987c3fbce1062acfa3ceab5185f3556e87..b9ca2ee41707bc5bc62bb11bd4628efc4b270c3f 100644
>--- a/Source/WebKit/WebProcess/WebProcess.h
>+++ b/Source/WebKit/WebProcess/WebProcess.h
>@@ -394,11 +394,6 @@ private:
> #endif
> #endif
> 
>-#if ENABLE(VIDEO)
>-    void suspendAllMediaBuffering();
>-    void resumeAllMediaBuffering();
>-#endif
>-
>     void clearCurrentModifierStateForTesting();
> 
>     RefPtr<WebConnectionToUIProcess> m_webConnection;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9cd8fc04f11cadda139eea5967e7d92bd9e2860b..ce25452df926684eef32f85bb4df0a5aa7565759 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-14  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241486.
>+        https://bugs.webkit.org/show_bug.cgi?id=194655
>+
>+        causing API failures in builds (Requested by ShawnRoberts on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "[Cocoa] Media elements will restart network buffering just
>+        before suspending"
>+        https://bugs.webkit.org/show_bug.cgi?id=193691
>+        https://trac.webkit.org/changeset/241486
>+
> 2019-02-14  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapse] Replaced boxes don't collapse through their margins
>diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>index e4e22732bf59e150fd8d62f3a1cb12fb463724a4..7c6e12360b2183718034e701f9792b7beeb92d59 100644
>--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>@@ -788,7 +788,6 @@
> 		CDA315981ED53651009F60D3 /* MediaPlaybackSleepAssertion.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA315961ED53651009F60D3 /* MediaPlaybackSleepAssertion.mm */; };
> 		CDA3159A1ED548F1009F60D3 /* MediaPlaybackSleepAssertion.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CDA315991ED540A5009F60D3 /* MediaPlaybackSleepAssertion.html */; };
> 		CDA3159D1ED5643F009F60D3 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDA3159C1ED5643F009F60D3 /* IOKit.framework */; };
>-		CDA4438E21F7A47700379489 /* ProcessSuspendMediaBuffering.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA4438D21F7A47700379489 /* ProcessSuspendMediaBuffering.mm */; };
> 		CDB4115A1E0B00DB00EAD352 /* video-with-muted-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CDB411591E09DA8E00EAD352 /* video-with-muted-audio.html */; };
> 		CDB5DFFF213610FA00D3E189 /* now-playing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CDB5DFFE21360ED800D3E189 /* now-playing.html */; };
> 		CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDBFCC431A9FF44800A7B691 /* FullscreenZoomInitialFrame.mm */; };
>@@ -2116,7 +2115,6 @@
> 		CDA315961ED53651009F60D3 /* MediaPlaybackSleepAssertion.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlaybackSleepAssertion.mm; sourceTree = "<group>"; };
> 		CDA315991ED540A5009F60D3 /* MediaPlaybackSleepAssertion.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = MediaPlaybackSleepAssertion.html; sourceTree = "<group>"; };
> 		CDA3159C1ED5643F009F60D3 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
>-		CDA4438D21F7A47700379489 /* ProcessSuspendMediaBuffering.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ProcessSuspendMediaBuffering.mm; sourceTree = "<group>"; };
> 		CDB411591E09DA8E00EAD352 /* video-with-muted-audio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "video-with-muted-audio.html"; sourceTree = "<group>"; };
> 		CDB5DFFE21360ED800D3E189 /* now-playing.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "now-playing.html"; sourceTree = "<group>"; };
> 		CDBFCC421A9FF44800A7B691 /* FullscreenZoomInitialFrame.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FullscreenZoomInitialFrame.html; sourceTree = "<group>"; };
>@@ -2572,7 +2570,6 @@
> 				CD227E43211A4D5D00D285AF /* PreferredAudioBufferSize.mm */,
> 				7C1AF7931E8DCBAB002645B9 /* PrepareForMoveToWindow.mm */,
> 				41882F0221010A70002FF288 /* ProcessPreWarming.mm */,
>-				CDA4438D21F7A47700379489 /* ProcessSuspendMediaBuffering.mm */,
> 				518C1152205B04F9001FF4AE /* ProcessSwapOnNavigation.mm */,
> 				5798E2AF1CAF5C2800C5CBA0 /* ProvisionalURLNotChange.mm */,
> 				A1C4FB6C1BACCE50003742D0 /* QuickLook.mm */,
>@@ -4212,7 +4209,6 @@
> 				7CCE7F0C1A411AE600447C4C /* PrivateBrowsingPushStateNoHistoryCallback.cpp in Sources */,
> 				4647B1261EBA3B850041D7EF /* ProcessDidTerminate.cpp in Sources */,
> 				41882F0321010C0D002FF288 /* ProcessPreWarming.mm in Sources */,
>-				CDA4438E21F7A47700379489 /* ProcessSuspendMediaBuffering.mm in Sources */,
> 				518C1153205B0504001FF4AE /* ProcessSwapOnNavigation.mm in Sources */,
> 				7C83E0C11D0A652F00FEBCF3 /* ProvisionalURLNotChange.mm in Sources */,
> 				041A1E34216FFDBC00789E0A /* PublicSuffix.cpp in Sources */,
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSuspendMediaBuffering.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSuspendMediaBuffering.mm
>deleted file mode 100644
>index 6dd32de39fb6d5420c11c729110e6feaad1bd50f..0000000000000000000000000000000000000000
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSuspendMediaBuffering.mm
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-/*
>- * Copyright (C) 2019 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-
>-#if WK_API_ENABLED && WK_HAVE_C_SPI
>-
>-#import "PlatformUtilities.h"
>-#import "TestWKWebView.h"
>-
>-#import <WebKit/WKWebViewConfigurationPrivate.h>
>-#import <WebKit/WKWebViewPrivate.h>
>-
>-TEST(WebKit, ProcessSuspendMediaBuffering)
>-{
>-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>-    WKRetainPtr<WKContextRef> context(AdoptWK, TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
>-    configuration.get().processPool = (WKProcessPool *)context.get();
>-    configuration.get()._mediaDataLoadsAutomatically = YES;
>-    configuration.get().mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeNone;
>-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]);
>-
>-    __block bool isPlaying = false;
>-    [webView performAfterReceivingMessage:@"playing" action:^() { isPlaying = true; }];
>-
>-    TestWebKitAPI::Util::run(&isPlaying);
>-
>-    auto isElementAllowedToBuffer = [&] {
>-        return [webView stringByEvaluatingJavaScript:@"window.internals.elementShouldBufferData(document.querySelector('video'))"].boolValue;
>-    };
>-
>-    ASSERT_TRUE(isElementAllowedToBuffer());
>-
>-    [webView _processWillSuspendImminentlyForTesting];
>-
>-    ASSERT_FALSE(isElementAllowedToBuffer());
>-
>-    [webView _processDidResumeForTesting];
>-
>-    ASSERT_TRUE(isElementAllowedToBuffer());
>-}
>-
>-#endif // WK_API_ENABLED && WK_HAVE_C_SPI

Actions: View | Formatted Diff | Diff

Attachments on bug 194655: 362023