| 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 "modules/serviceworkers/RespondWithObserver.h" | 5 #include "modules/serviceworkers/RespondWithObserver.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptFunction.h" | 7 #include "bindings/core/v8/ScriptFunction.h" |
| 8 #include "bindings/core/v8/ScriptPromise.h" | 8 #include "bindings/core/v8/ScriptPromise.h" |
| 9 #include "bindings/core/v8/ScriptValue.h" | 9 #include "bindings/core/v8/ScriptValue.h" |
| 10 #include "bindings/core/v8/V8Binding.h" | 10 #include "bindings/core/v8/V8Binding.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 break; | 52 break; |
| 53 case WebServiceWorkerResponseErrorResponseTypeOpaqueForClientRequest: | 53 case WebServiceWorkerResponseErrorResponseTypeOpaqueForClientRequest: |
| 54 errorMessage = errorMessage + "an \"opaque\" response was used for a cli
ent request."; | 54 errorMessage = errorMessage + "an \"opaque\" response was used for a cli
ent request."; |
| 55 break; | 55 break; |
| 56 case WebServiceWorkerResponseErrorResponseTypeOpaqueRedirect: | 56 case WebServiceWorkerResponseErrorResponseTypeOpaqueRedirect: |
| 57 errorMessage = errorMessage + "an \"opaqueredirect\" type response was u
sed for a request which is not a navigation request."; | 57 errorMessage = errorMessage + "an \"opaqueredirect\" type response was u
sed for a request which is not a navigation request."; |
| 58 break; | 58 break; |
| 59 case WebServiceWorkerResponseErrorBodyLocked: | 59 case WebServiceWorkerResponseErrorBodyLocked: |
| 60 errorMessage = errorMessage + "a Response whose \"body\" is locked canno
t be used to respond to a request."; | 60 errorMessage = errorMessage + "a Response whose \"body\" is locked canno
t be used to respond to a request."; |
| 61 break; | 61 break; |
| 62 case WebServiceWorkerResponseErrorNoForeignFetchResponse: |
| 63 errorMessage = errorMessage + "an object that was not a ForeignFetchResp
onse was passed to respondWith()."; |
| 64 break; |
| 62 case WebServiceWorkerResponseErrorUnknown: | 65 case WebServiceWorkerResponseErrorUnknown: |
| 63 default: | 66 default: |
| 64 errorMessage = errorMessage + "an unexpected error occurred."; | 67 errorMessage = errorMessage + "an unexpected error occurred."; |
| 65 break; | 68 break; |
| 66 } | 69 } |
| 67 return errorMessage; | 70 return errorMessage; |
| 68 } | 71 } |
| 69 | 72 |
| 70 bool isNavigationRequest(WebURLRequest::FrameType frameType) | 73 bool isNavigationRequest(WebURLRequest::FrameType frameType) |
| 71 { | 74 { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 m_observer->responseWasFulfilled(value); | 130 m_observer->responseWasFulfilled(value); |
| 128 } | 131 } |
| 129 m_observer = nullptr; | 132 m_observer = nullptr; |
| 130 return value; | 133 return value; |
| 131 } | 134 } |
| 132 | 135 |
| 133 Member<RespondWithObserver> m_observer; | 136 Member<RespondWithObserver> m_observer; |
| 134 ResolveType m_resolveType; | 137 ResolveType m_resolveType; |
| 135 }; | 138 }; |
| 136 | 139 |
| 140 RespondWithObserver::~RespondWithObserver() {} |
| 141 |
| 137 RespondWithObserver* RespondWithObserver::create(ExecutionContext* context, int
eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, We
bURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext) | 142 RespondWithObserver* RespondWithObserver::create(ExecutionContext* context, int
eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, We
bURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext) |
| 138 { | 143 { |
| 139 return new RespondWithObserver(context, eventID, requestURL, requestMode, fr
ameType, requestContext); | 144 return new RespondWithObserver(context, eventID, requestURL, requestMode, fr
ameType, requestContext); |
| 140 } | 145 } |
| 141 | 146 |
| 142 void RespondWithObserver::contextDestroyed() | 147 void RespondWithObserver::contextDestroyed() |
| 143 { | 148 { |
| 144 ContextLifecycleObserver::contextDestroyed(); | 149 ContextLifecycleObserver::contextDestroyed(); |
| 145 m_state = Done; | 150 m_state = Done; |
| 146 } | 151 } |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 , m_state(Initial) | 265 , m_state(Initial) |
| 261 { | 266 { |
| 262 } | 267 } |
| 263 | 268 |
| 264 DEFINE_TRACE(RespondWithObserver) | 269 DEFINE_TRACE(RespondWithObserver) |
| 265 { | 270 { |
| 266 ContextLifecycleObserver::trace(visitor); | 271 ContextLifecycleObserver::trace(visitor); |
| 267 } | 272 } |
| 268 | 273 |
| 269 } // namespace blink | 274 } // namespace blink |
| OLD | NEW |