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

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerError.h

Issue 27278002: Add an Error class for ServiceWorkers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: enum for error type, document ownership Created 7 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 | Annotate | Revision Log
OLDNEW
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 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 #ifndef ServiceWorker_h 31 #ifndef ServiceWorkerError_h
32 #define ServiceWorker_h 32 #define ServiceWorkerError_h
33 33
34 #include "public/platform/WebServiceWorker.h" 34 #include "core/dom/DOMError.h"
35 #include "wtf/OwnPtr.h" 35 #include "public/platform/WebServiceWorkerError.h"
36 #include "wtf/PassOwnPtr.h"
37 #include "wtf/PassRefPtr.h"
38 #include "wtf/RefCounted.h"
39
40 namespace WebKit {
41 class WebServiceWorker;
42 }
43 36
44 namespace WebCore { 37 namespace WebCore {
45 38
46 class ServiceWorker : public RefCounted<ServiceWorker> { 39 class ServiceWorkerError : public DOMError {
47 public: 40 public:
48 static PassRefPtr<ServiceWorker> create(PassOwnPtr<WebKit::WebServiceWorker> worker) 41 static PassRefPtr<ServiceWorkerError> create(WebKit::WebServiceWorkerError:: ErrorType type, const String& message)
49 { 42 {
50 return adoptRef(new ServiceWorker(worker)); 43 return adoptRef(new ServiceWorkerError(type, message));
51 } 44 }
52 45
53 // For CallbackPromiseAdapter 46 // For CallbackPromiseAdapter
54 typedef WebKit::WebServiceWorker WebType; 47 typedef WebKit::WebServiceWorkerError WebType;
55 static PassRefPtr<ServiceWorker> from(WebType* worker) 48 static PassRefPtr<DOMError> from(WebType* webError)
56 { 49 {
57 return create(adoptPtr(worker)); 50 return create(webError->errorType(), webError->message());
kinuko 2013/10/15 23:44:44 If this class takes ownership of webError we shoul
58 } 51 }
59 52
60 ~ServiceWorker() { } 53 static const String& GetErrorString(WebKit::WebServiceWorkerError::ErrorType );
54
55 ~ServiceWorkerError() { }
61 56
62 private: 57 private:
63 explicit ServiceWorker(PassOwnPtr<WebKit::WebServiceWorker>); 58 ServiceWorkerError(WebKit::WebServiceWorkerError::ErrorType type, const Stri ng& message) : DOMError(GetErrorString(type), message) { }
64
65 OwnPtr<WebKit::WebServiceWorker> m_outerWorker;
66 }; 59 };
67 60
68 } // namespace WebCore 61 } // namespace WebCore
69 62
70 #endif // ServiceWorker_h 63 #endif // ServiceWorkerError_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698