Chromium Code Reviews| Index: Source/modules/serviceworkers/WaitUntilObserver.cpp |
| diff --git a/Source/modules/serviceworkers/WaitUntilObserver.cpp b/Source/modules/serviceworkers/WaitUntilObserver.cpp |
| index f239f541f70185976a3e31dc9aab55232ea62e79..fc484de87ed7c6dc858ec8319bc1ddfc0afc7a9e 100644 |
| --- a/Source/modules/serviceworkers/WaitUntilObserver.cpp |
| +++ b/Source/modules/serviceworkers/WaitUntilObserver.cpp |
| @@ -84,6 +84,7 @@ WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, int eventID) |
| : ContextLifecycleObserver(context) |
| , m_eventID(eventID) |
| , m_pendingActivity(0) |
| + , m_result(blink::WebServiceWorkerEventResultCompleted) |
|
kinuko
2014/03/26 12:53:56
nit: it feels a bit weird to me to initialize and
falken
2014/03/26 14:38:33
Makes sense to me. I switched to m_hasError.
|
| { |
| } |
| @@ -91,6 +92,8 @@ void WaitUntilObserver::reportError(const ScriptValue& value) |
| { |
| // FIXME: Propagate error message to the client for onerror handling. |
| notImplemented(); |
| + |
| + m_result = blink::WebServiceWorkerEventResultRejected; |
| } |
| void WaitUntilObserver::incrementPendingActivity() |
| @@ -104,7 +107,7 @@ void WaitUntilObserver::decrementPendingActivity() |
| if (--m_pendingActivity || !executionContext()) |
| return; |
| - ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleInstallEvent(m_eventID); |
| + ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleInstallEvent(m_eventID, m_result); |
| observeContext(0); |
| } |