Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

Issue 2433773006: Remove ExecutionContext::activeDOMObjectsAreStopped()
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include <utility>
12 12
13 namespace blink { 13 namespace blink {
14 14
15 void NavigateClientCallback::onSuccess( 15 void NavigateClientCallback::onSuccess(
16 std::unique_ptr<WebServiceWorkerClientInfo> clientInfo) { 16 std::unique_ptr<WebServiceWorkerClientInfo> clientInfo) {
17 if (!m_resolver->getExecutionContext() || 17 if (!m_resolver->getExecutionContext())
18 m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
19 return; 18 return;
20 m_resolver->resolve(ServiceWorkerWindowClient::take( 19 m_resolver->resolve(
21 m_resolver.get(), wrapUnique(clientInfo.release()))); 20 ServiceWorkerWindowClient::take(m_resolver.get(), std::move(clientInfo)));
22 } 21 }
23 22
24 void NavigateClientCallback::onError(const WebServiceWorkerError& error) { 23 void NavigateClientCallback::onError(const WebServiceWorkerError& error) {
25 if (!m_resolver->getExecutionContext() || 24 if (!m_resolver->getExecutionContext())
26 m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
27 return; 25 return;
28 26
29 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) { 27 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) {
30 ScriptState::Scope scope(m_resolver->getScriptState()); 28 ScriptState::Scope scope(m_resolver->getScriptState());
31 m_resolver->reject(V8ThrowException::createTypeError( 29 m_resolver->reject(V8ThrowException::createTypeError(
32 m_resolver->getScriptState()->isolate(), error.message)); 30 m_resolver->getScriptState()->isolate(), error.message));
33 return; 31 return;
34 } 32 }
35 33
36 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error)); 34 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
37 } 35 }
38 36
39 } // namespace blink 37 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698