Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / serviceworkers / InstallEvent.cpp

diff --git a/src/third_party/WebKit/Source/modules/serviceworkers/InstallEvent.cpp b/src/third_party/WebKit/Source/modules/serviceworkers/InstallEvent.cpp
index 5c30abb..d0942e1 100644 (file)
--- a/src/third_party/WebKit/Source/modules/serviceworkers/InstallEvent.cpp
+++ b/src/third_party/WebKit/Source/modules/serviceworkers/InstallEvent.cpp
@@ -40,12 +40,12 @@ namespace WebCore {
 
 PassRefPtrWillBeRawPtr<InstallEvent> InstallEvent::create()
 {
-    return adoptRefWillBeRefCountedGarbageCollected(new InstallEvent());
+    return adoptRefWillBeNoop(new InstallEvent());
 }
 
 PassRefPtrWillBeRawPtr<InstallEvent> InstallEvent::create(const AtomicString& type, const EventInit& initializer, PassRefPtr<WaitUntilObserver> observer)
 {
-    return adoptRefWillBeRefCountedGarbageCollected(new InstallEvent(type, initializer, observer));
+    return adoptRefWillBeNoop(new InstallEvent(type, initializer, observer));
 }
 
 void InstallEvent::replace()
@@ -54,15 +54,15 @@ void InstallEvent::replace()
     notImplemented();
 }
 
-ScriptPromise InstallEvent::reloadAll(ExecutionContext* context)
+ScriptPromise InstallEvent::reloadAll(ScriptState* scriptState)
 {
     // FIXME: implement.
     notImplemented();
 
     // For now this just returns a promise which is already rejected.
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(context);
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
-    resolver->reject(ScriptValue::createNull());
+    resolver->reject(ScriptValue(v8::Null(scriptState->isolate()), scriptState->isolate()));
     return promise;
 }