Changeset 224024 in webkit

Timestamp:

Oct 26, 2017 10:26:21 AM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r223994.

The LayoutTest for this change is failing.

Reverted changeset:

"Add service worker handle fetch support for all subresource
requests"
​https://bugs.webkit.org/show_bug.cgi?id=178769
​https://trac.webkit.org/changeset/223994

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/workers/service/image-fetch.https-expected.txt (deleted)
• LayoutTests/http/tests/workers/service/image-fetch.https.html (deleted)
• LayoutTests/http/tests/workers/service/resources/image-fetch-worker.js (deleted)
• LayoutTests/http/tests/workers/service/resources/image-fetch.js (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentThreadableLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequest.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequest.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-26  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223994.
+
+        The LayoutTest for this change is failing.
+
+        Reverted changeset:
+
+        "Add service worker handle fetch support for all subresource
+        requests"
+        https://bugs.webkit.org/show_bug.cgi?id=178769
+        https://trac.webkit.org/changeset/223994
+
 2017-10-25  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-26  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223994.
+
+        The LayoutTest for this change is failing.
+
+        Reverted changeset:
+
+        "Add service worker handle fetch support for all subresource
+        requests"
+        https://bugs.webkit.org/show_bug.cgi?id=178769
+        https://trac.webkit.org/changeset/223994
+
 2017-10-26  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -104 +104 @@
     relaxAdoptionRequirement();
 
+#if ENABLE(SERVICE_WORKER)
+    if (m_options.serviceWorkersMode == ServiceWorkersMode::All && !m_options.serviceWorkerIdentifier)
+        m_options.serviceWorkerIdentifier = document.selectedServiceWorkerIdentifier();
+#endif
+
     // Setting a referrer header is only supported in the async code path.
     ASSERT(m_async || m_referrer.isEmpty());

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -687 +687 @@
 {
     // Implementing step 1 to 7 of https://fetch.spec.whatwg.org/#fetching
-    auto* document = this->document();
-
-    if (document) {
-        if (!request.origin())
-            request.setOrigin(document->securityOrigin());
-#if ENABLE(SERVICE_WORKER)
-        request.setSelectedServiceWorkerIdentifierIfNeeded(document->selectedServiceWorkerIdentifier());
-#endif
-    }
+
+    if (!request.origin() && document())
+        request.setOrigin(document()->securityOrigin());
 
     request.setAcceptHeaderIfNone(type);

trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp

@@ -274 +274 @@
 }
 
-#if ENABLE(SERVICE_WORKER)
-void CachedResourceRequest::setSelectedServiceWorkerIdentifierIfNeeded(uint64_t serviceWorkerIdentifier)
-{
-    if (isNonSubresourceRequest(m_options.destination))
-        return;
-    if (isPotentialNavigationOrSubresourceRequest(m_options.destination))
-        return;
-
-    if (m_options.serviceWorkersMode != ServiceWorkersMode::All)
-        return;
-    if (m_options.serviceWorkerIdentifier)
-        return;
-
-    m_options.serviceWorkerIdentifier = serviceWorkerIdentifier;
-}
-#endif
-
 } // namespace WebCore

trunk/Source/WebCore/loader/cache/CachedResourceRequest.h

@@ -96 +96 @@
     static String splitFragmentIdentifierFromRequestURL(ResourceRequest&);
 
-#if ENABLE(SERVICE_WORKER)
-    void setSelectedServiceWorkerIdentifierIfNeeded(uint64_t serviceWorkerIdentifier);
-#endif
-
 private:
     ResourceRequest m_resourceRequest;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-26  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223994.
+
+        The LayoutTest for this change is failing.
+
+        Reverted changeset:
+
+        "Add service worker handle fetch support for all subresource
+        requests"
+        https://bugs.webkit.org/show_bug.cgi?id=178769
+        https://trac.webkit.org/changeset/223994
+
 2017-10-26  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp

@@ -65 +65 @@
         return false;
 
+    // FIXME: We should probably assert that options.serviceWorkersIdentifier is not null.
     if (isPotentialNavigationOrSubresourceRequest(options.destination))
         return false;
 
     // FIXME: Implement non-subresource request loads.
-    if (isNonSubresourceRequest(options.destination) || !options.serviceWorkerIdentifier)
+    if (isNonSubresourceRequest(options.destination))
         return false;