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 66 matching lines @@
 }
 
 
 ScriptPromise NavigatorServiceWorker::registerServiceWorker(ScriptExecutionContext* scriptExecutionContext, const String& pattern, const String& scriptSrc, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     FrameLoaderClient* client = m_navigator->frame()->loader()->client();
     // WTF? Surely there's a better way to resolve a url?
     KURL scriptUrl = m_navigator->frame()->document()->completeURL(scriptSrc);
     WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
+    ScriptPromise promise = ScriptPromise::create(scriptExecutionContext);
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, scriptExecutionContext);
 
     if (peer)
         peer->registerServiceWorker(pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
     // call here?
-    return resolver->promise();
+    return promise;
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ScriptExecutionContext* context, Navigator* navigator, const String& pattern, ExceptionState& es)
 {
     return from(navigator)->unregisterServiceWorker(context, pattern, es);
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ScriptExecutionContext* scriptExecutionContext, const String& pattern, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     FrameLoaderClient* client = m_navigator->frame()->loader()->client();
     WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
+    ScriptPromise promise = ScriptPromise::create(scriptExecutionContext);
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(promise, scriptExecutionContext);
     if (peer)
         peer->unregisterServiceWorker(pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
-    return resolver->promise();
+    return promise;
 }
 
 } // namespace WebCore