| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" | 5 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 8 #include "core/dom/DOMException.h" | 8 #include "core/dom/DOMException.h" |
| 9 #include "modules/serviceworkers/ServiceWorkerError.h" | 9 #include "modules/serviceworkers/ServiceWorkerError.h" |
| 10 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" | 10 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" |
| 11 #include "wtf/PtrUtil.h" |
| 11 | 12 |
| 12 namespace blink { | 13 namespace blink { |
| 13 | 14 |
| 14 void NavigateClientCallback::onSuccess(std::unique_ptr<WebServiceWorkerClientInf
o> clientInfo) | 15 void NavigateClientCallback::onSuccess(std::unique_ptr<WebServiceWorkerClientInf
o> clientInfo) |
| 15 { | 16 { |
| 16 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()-
>activeDOMObjectsAreStopped()) | 17 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()-
>activeDOMObjectsAreStopped()) |
| 17 return; | 18 return; |
| 18 m_resolver->resolve(ServiceWorkerWindowClient::take(m_resolver.get(), adoptP
tr(clientInfo.release()))); | 19 m_resolver->resolve(ServiceWorkerWindowClient::take(m_resolver.get(), wrapUn
ique(clientInfo.release()))); |
| 19 } | 20 } |
| 20 | 21 |
| 21 void NavigateClientCallback::onError(const WebServiceWorkerError& error) | 22 void NavigateClientCallback::onError(const WebServiceWorkerError& error) |
| 22 { | 23 { |
| 23 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()-
>activeDOMObjectsAreStopped()) | 24 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()-
>activeDOMObjectsAreStopped()) |
| 24 return; | 25 return; |
| 25 | 26 |
| 26 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) { | 27 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) { |
| 27 ScriptState::Scope scope(m_resolver->getScriptState()); | 28 ScriptState::Scope scope(m_resolver->getScriptState()); |
| 28 m_resolver->reject(V8ThrowException::createTypeError(m_resolver->getScri
ptState()->isolate(), error.message)); | 29 m_resolver->reject(V8ThrowException::createTypeError(m_resolver->getScri
ptState()->isolate(), error.message)); |
| 29 return; | 30 return; |
| 30 } | 31 } |
| 31 | 32 |
| 32 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error)); | 33 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error)); |
| 33 } | 34 } |
| 34 | 35 |
| 35 } // namespace blink | 36 } // namespace blink |
| OLD | NEW |