Bug 1198230 - Respect FetchEvent.preventDefault(). r=jdm

Update web-platform-tests expected data

docshell/base/nsDocShell.cpp

@@ -4979,6 +4979,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
       case NS_ERROR_INTERCEPTED_USED_RESPONSE:
       case NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION:
       case NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION:
+      case NS_ERROR_INTERCEPTION_CANCELED:
         // ServiceWorker intercepted request, but something went wrong.
         nsContentUtils::MaybeReportInterceptionErrorToConsole(GetDocument(),
                                                               aError);
@@ -7631,6 +7632,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
                aStatus == NS_ERROR_INTERCEPTED_ERROR_RESPONSE ||
                aStatus == NS_ERROR_INTERCEPTED_USED_RESPONSE ||
                aStatus == NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION ||
+               aStatus == NS_ERROR_INTERCEPTION_CANCELED ||
                NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) {
       // Errors to be shown for any frame
       DisplayLoadError(aStatus, url, nullptr, aChannel);

dom/base/nsContentUtils.cpp

@@ -3460,6 +3460,8 @@ nsContentUtils::MaybeReportInterceptionErrorToConsole(nsIDocument* aDocument,
     messageName = "ClientRequestOpaqueInterception";
   } else if (aError == NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION) {
     messageName = "BadOpaqueRedirectInterception";
+  } else if (aError == NS_ERROR_INTERCEPTION_CANCELED) {
+    messageName = "InterceptionCanceled";
   }
 
   if (messageName) {

dom/locales/en-US/chrome/dom/dom.properties

@@ -177,3 +177,5 @@ InterceptedUsedResponse=A ServiceWorker passed a used Response to FetchEvent.res
 ClientRequestOpaqueInterception=A ServiceWorker passed an opaque Response to FetchEvent.respondWith() while FetchEvent.request was a client request. A client request is generally a browser navigation or top-level Worker script.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker", "opaqueredirect", "Response", "FetchEvent.respondWith()", or "FetchEvent.request".
 BadOpaqueRedirectInterception=A ServiceWorker passed an opaqueredirect Response to FetchEvent.respondWith() while FetchEvent.request was not a navigation request.
+# LOCALIZATION NOTE: Do not translate "ServiceWorker" or "FetchEvent.preventDefault()".
+InterceptionCanceled=ServiceWorker canceled network interception by calling FetchEvent.preventDefault().

dom/workers/ServiceWorkerEvents.cpp

@@ -32,6 +32,22 @@ using namespace mozilla::dom;
 
 BEGIN_WORKERS_NAMESPACE
 
+CancelChannelRunnable::CancelChannelRunnable(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                                             nsresult aStatus)
+  : mChannel(aChannel)
+  , mStatus(aStatus)
+{
+}
+
+NS_IMETHODIMP
+CancelChannelRunnable::Run()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  nsresult rv = mChannel->Cancel(mStatus);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
 FetchEvent::FetchEvent(EventTarget* aOwner)
 : Event(aOwner, nullptr, nullptr)
 , mIsReload(false)
@@ -76,27 +92,6 @@ FetchEvent::Constructor(const GlobalObject& aGlobal,
 
 namespace {
 
-class CancelChannelRunnable final : public nsRunnable
-{
-  nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
-  const nsresult mStatus;
-public:
-  CancelChannelRunnable(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
-                        nsresult aStatus)
-    : mChannel(aChannel)
-    , mStatus(aStatus)
-  {
-  }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-    nsresult rv = mChannel->Cancel(mStatus);
-    NS_ENSURE_SUCCESS(rv, rv);
-    return NS_OK;
-  }
-};
-
 class FinishResponse final : public nsRunnable
 {
   nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;

dom/workers/ServiceWorkerEvents.h

@@ -36,6 +36,17 @@ BEGIN_WORKERS_NAMESPACE
 
 class ServiceWorkerClient;
 
+class CancelChannelRunnable final : public nsRunnable
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
+  const nsresult mStatus;
+public:
+  CancelChannelRunnable(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                        nsresult aStatus);
+
+  NS_IMETHOD Run() override;
+};
+
 class FetchEvent final : public Event
 {
   nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;

dom/workers/ServiceWorkerManager.cpp

@@ -3839,7 +3839,7 @@ private:
     init.mRequest.Construct();
     init.mRequest.Value() = request;
     init.mBubbles = false;
-    init.mCancelable = false;
+    init.mCancelable = true;
     init.mIsReload.Construct(mIsReload);
     nsRefPtr<FetchEvent> event =
       FetchEvent::Constructor(globalObj, NS_LITERAL_STRING("fetch"), init, result);
@@ -3854,7 +3854,13 @@ private:
     nsRefPtr<EventTarget> target = do_QueryObject(aWorkerPrivate->GlobalScope());
     nsresult rv2 = target->DispatchDOMEvent(nullptr, event, nullptr, nullptr);
     if (NS_WARN_IF(NS_FAILED(rv2)) || !event->WaitToRespond()) {
-      nsCOMPtr<nsIRunnable> runnable = new ResumeRequest(mInterceptedChannel);
+      nsCOMPtr<nsIRunnable> runnable;
+      if (event->DefaultPrevented(aCx)) {
+        runnable = new CancelChannelRunnable(mInterceptedChannel, NS_ERROR_INTERCEPTION_CANCELED);
+      } else {
+        runnable = new ResumeRequest(mInterceptedChannel);
+      }
+
       MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
     }
     return true;

testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-network-error.https.html.ini

@@ -7,6 +7,3 @@
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): https://bugzilla.mozilla.org/show_bug.cgi?id=1178715
   expected:
     if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): CRASH
-  [Rejecting the fetch event or using preventDefault() causes a network error]
-    expected: FAIL
-

xpcom/base/ErrorList.h

@@ -335,6 +335,8 @@
   ERROR(NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION,   FAILURE(105)),
   /* Service worker intercepted a non-navigation with an opaque redirect */
   ERROR(NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION,     FAILURE(106)),
+  /* Service worker intentionally canceled load via preventDefault(). */
+  ERROR(NS_ERROR_INTERCEPTION_CANCELED,                FAILURE(107)),
 #undef MODULE