Decouple ScriptPromise creation from ScriptPromiseResolver.

Source/modules/serviceworkers/NavigatorServiceWorker.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 101 matching lines @@
         es.throwSecurityError("Can only register for patterns in the document's origin.");
         return ScriptPromise();
     }
 
     KURL scriptURL = executionContext->completeURL(scriptSrc);
     if (documentOrigin->canRequest(scriptURL)) {
         es.throwSecurityError("Script must be in document's origin.");
         return ScriptPromise();
     }
 
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
+    ScriptPromise promise = ScriptPromise::createPending(executionContext);
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, executionContext);
     ensureProvider()->registerServiceWorker(patternURL, scriptURL, new CallbackPromiseAdapter(resolver, executionContext));
-    return resolver->promise();
+    return promise;
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ExecutionContext* context, Navigator* navigator, const String& pattern, ExceptionState& es)
 {
     return from(navigator)->unregisterServiceWorker(context, pattern, es);
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ExecutionContext* executionContext, const String& pattern, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     Frame* frame = m_navigator->frame();
     if (!frame) {
         es.throwDOMException(InvalidStateError, "No document available.");
         return ScriptPromise();
     }
 
     RefPtr<SecurityOrigin> documentOrigin = frame->document()->securityOrigin();
 
     KURL patternURL = executionContext->completeURL(pattern);
     if (documentOrigin->canRequest(patternURL)) {
         es.throwSecurityError("Can only unregister for patterns in the document's origin.");
         return ScriptPromise();
     }
 
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(executionContext);
+    ScriptPromise promise = ScriptPromise::createPending(executionContext);
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, executionContext);
     ensureProvider()->unregisterServiceWorker(patternURL, new CallbackPromiseAdapter(resolver, executionContext));
-    return resolver->promise();
+    return promise;
 }
 
 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame()
 {
     m_provider = nullptr;
     DOMWindowProperty::willDetachGlobalObjectFromFrame();
 }
 
 
 } // namespace WebCore