ServiceWorker: Change base URL for parsing script URL and scope URL

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 264 matching lines @@
                                           "The document is in an invalid "
                                           "state."));
     return promise;
   }
 
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!executionContext)
     return ScriptPromise();
 
-  KURL scriptURL =
-      enteredExecutionContext(scriptState->isolate())->completeURL(url);
+  KURL scriptURL = executionContext->completeURL(url);
   scriptURL.removeFragmentIdentifier();
 
   KURL patternURL;
   if (options.scope().isNull())
     patternURL = KURL(scriptURL, "./");
   else
-    patternURL = enteredExecutionContext(scriptState->isolate())
-                     ->completeURL(options.scope());
+    patternURL = executionContext->completeURL(options.scope());
 
   registerServiceWorkerImpl(
       executionContext, scriptURL, patternURL,
       WTF::makeUnique<CallbackPromiseAdapter<ServiceWorkerRegistration,
                                              ServiceWorkerErrorForUpdate>>(
           resolver));
 
   return promise;
 }
 
@@ skipping 27 matching lines @@
   if (!SchemeRegistry::shouldTreatURLSchemeAsAllowingServiceWorkers(
           pageURL.protocol())) {
     resolver->reject(DOMException::create(
         SecurityError,
         "Failed to get a ServiceWorkerRegistration: The URL protocol of the "
         "current origin ('" +
             documentOrigin->toString() + "') is not supported."));
     return promise;
   }
 
-  KURL completedURL =
-      enteredExecutionContext(scriptState->isolate())->completeURL(documentURL);
+  KURL completedURL = executionContext->completeURL(documentURL);
   completedURL.removeFragmentIdentifier();
   if (!documentOrigin->canRequest(completedURL)) {
     RefPtr<SecurityOrigin> documentURLOrigin =
         SecurityOrigin::create(completedURL);
     resolver->reject(
         DOMException::create(SecurityError,
                              "Failed to get a ServiceWorkerRegistration: The "
                              "origin of the provided documentURL ('" +
                                  documentURLOrigin->toString() +
                                  "') does not match the current origin ('" +
@@ skipping 131 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::from(executionContext)) {
     m_provider = client->provider();
     if (m_provider)
       m_provider->setClient(this);
   }
 }
 
 }  // namespace blink