| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/serviceworkers/WaitUntilObserver.h" | 6 #include "modules/serviceworkers/WaitUntilObserver.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptFunction.h" | 8 #include "bindings/core/v8/ScriptFunction.h" |
| 9 #include "bindings/core/v8/ScriptPromise.h" | 9 #include "bindings/core/v8/ScriptPromise.h" |
| 10 #include "bindings/core/v8/ScriptValue.h" | 10 #include "bindings/core/v8/ScriptValue.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 m_eventDispatched = true; | 81 m_eventDispatched = true; |
| 82 } | 82 } |
| 83 | 83 |
| 84 void WaitUntilObserver::waitUntil(ScriptState* scriptState, const ScriptValue& v
alue, ExceptionState& exceptionState) | 84 void WaitUntilObserver::waitUntil(ScriptState* scriptState, const ScriptValue& v
alue, ExceptionState& exceptionState) |
| 85 { | 85 { |
| 86 if (m_eventDispatched) { | 86 if (m_eventDispatched) { |
| 87 exceptionState.throwDOMException(InvalidStateError, "The event handler i
s already finished."); | 87 exceptionState.throwDOMException(InvalidStateError, "The event handler i
s already finished."); |
| 88 return; | 88 return; |
| 89 } | 89 } |
| 90 | 90 |
| 91 if (!executionContext()) |
| 92 return; |
| 93 |
| 94 // When handling a notificationclick event, we want to allow one window to |
| 95 // be focused. Regardless of whether one window was focused, |
| 96 // |consumeWindowFocus| will be called when all the pending activities will |
| 97 // be resolved. |
| 98 if (m_type == NotificationClick) |
| 99 executionContext()->allowWindowFocus(); |
| 100 |
| 91 incrementPendingActivity(); | 101 incrementPendingActivity(); |
| 92 ScriptPromise::cast(scriptState, value).then( | 102 ScriptPromise::cast(scriptState, value).then( |
| 93 ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled)
, | 103 ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled)
, |
| 94 ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected))
; | 104 ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected))
; |
| 95 } | 105 } |
| 96 | 106 |
| 97 WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, EventType type,
int eventID) | 107 WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, EventType type,
int eventID) |
| 98 : ContextLifecycleObserver(context) | 108 : ContextLifecycleObserver(context) |
| 99 , m_type(type) | 109 , m_type(type) |
| 100 , m_eventID(eventID) | 110 , m_eventID(eventID) |
| (...skipping 26 matching lines...) Expand all Loading... |
| 127 WebServiceWorkerEventResult result = m_hasError ? WebServiceWorkerEventResul
tRejected : WebServiceWorkerEventResultCompleted; | 137 WebServiceWorkerEventResult result = m_hasError ? WebServiceWorkerEventResul
tRejected : WebServiceWorkerEventResultCompleted; |
| 128 switch (m_type) { | 138 switch (m_type) { |
| 129 case Activate: | 139 case Activate: |
| 130 client->didHandleActivateEvent(m_eventID, result); | 140 client->didHandleActivateEvent(m_eventID, result); |
| 131 break; | 141 break; |
| 132 case Install: | 142 case Install: |
| 133 client->didHandleInstallEvent(m_eventID, result); | 143 client->didHandleInstallEvent(m_eventID, result); |
| 134 break; | 144 break; |
| 135 case NotificationClick: | 145 case NotificationClick: |
| 136 client->didHandleNotificationClickEvent(m_eventID, result); | 146 client->didHandleNotificationClickEvent(m_eventID, result); |
| 147 executionContext()->consumeWindowFocus(); |
| 137 break; | 148 break; |
| 138 case Push: | 149 case Push: |
| 139 client->didHandlePushEvent(m_eventID, result); | 150 client->didHandlePushEvent(m_eventID, result); |
| 140 break; | 151 break; |
| 141 } | 152 } |
| 142 observeContext(0); | 153 observeContext(0); |
| 143 } | 154 } |
| 144 | 155 |
| 145 } // namespace blink | 156 } // namespace blink |
| OLD | NEW |