| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "ServiceWorkerError.h" | 32 #include "ServiceWorkerError.h" |
| 33 | 33 |
| 34 #include "core/dom/DOMException.h" |
| 34 #include "core/dom/ExceptionCode.h" | 35 #include "core/dom/ExceptionCode.h" |
| 35 | 36 |
| 36 using blink::WebServiceWorkerError; | 37 using blink::WebServiceWorkerError; |
| 37 | 38 |
| 38 namespace blink { | 39 namespace blink { |
| 39 | 40 |
| 40 static PassRefPtrWillBeRawPtr<DOMException> createException( | 41 static DOMException* createException(ExceptionCode code, const String& defaultMe
ssage, const String& message) |
| 41 ExceptionCode code, const String& defaultMessage, const String& message) | |
| 42 { | 42 { |
| 43 return DOMException::create(code, message.isEmpty() ? defaultMessage : messa
ge); | 43 return DOMException::create(code, message.isEmpty() ? defaultMessage : messa
ge); |
| 44 } | 44 } |
| 45 | 45 |
| 46 // static | 46 // static |
| 47 PassRefPtrWillBeRawPtr<DOMException> ServiceWorkerError::take(ScriptPromiseResol
ver*, WebType* webErrorRaw) | 47 DOMException* ServiceWorkerError::take(ScriptPromiseResolver*, WebType* webError
Raw) |
| 48 { | 48 { |
| 49 OwnPtr<WebType> webError = adoptPtr(webErrorRaw); | 49 OwnPtr<WebType> webError = adoptPtr(webErrorRaw); |
| 50 switch (webError->errorType) { | 50 switch (webError->errorType) { |
| 51 case WebServiceWorkerError::ErrorTypeAbort: | 51 case WebServiceWorkerError::ErrorTypeAbort: |
| 52 return createException(AbortError, "The Service Worker operation was abo
rted.", webError->message); | 52 return createException(AbortError, "The Service Worker operation was abo
rted.", webError->message); |
| 53 case WebServiceWorkerError::ErrorTypeActivate: | 53 case WebServiceWorkerError::ErrorTypeActivate: |
| 54 // Not currently returned as a promise rejection. | 54 // Not currently returned as a promise rejection. |
| 55 // FIXME: Introduce new ActivateError type to ExceptionCodes? | 55 // FIXME: Introduce new ActivateError type to ExceptionCodes? |
| 56 return createException(AbortError, "The Service Worker activation failed
.", webError->message); | 56 return createException(AbortError, "The Service Worker activation failed
.", webError->message); |
| 57 case WebServiceWorkerError::ErrorTypeDisabled: | 57 case WebServiceWorkerError::ErrorTypeDisabled: |
| (...skipping 18 matching lines...) Expand all Loading... |
| 76 return DOMException::create(UnknownError); | 76 return DOMException::create(UnknownError); |
| 77 } | 77 } |
| 78 | 78 |
| 79 // static | 79 // static |
| 80 void ServiceWorkerError::dispose(WebType* webErrorRaw) | 80 void ServiceWorkerError::dispose(WebType* webErrorRaw) |
| 81 { | 81 { |
| 82 delete webErrorRaw; | 82 delete webErrorRaw; |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace blink | 85 } // namespace blink |
| OLD | NEW |