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

Side by Side Diff: third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerProvider.h

Issue 1865913005: Nuke WebPassOwnPtr<T> and replace it with std::unique_ptr<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 /* 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 14 matching lines...) Expand all
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 WebServiceWorkerProvider_h 31 #ifndef WebServiceWorkerProvider_h
32 #define WebServiceWorkerProvider_h 32 #define WebServiceWorkerProvider_h
33 33
34 #include "public/platform/WebCallbacks.h" 34 #include "public/platform/WebCallbacks.h"
35 #include "public/platform/WebPassOwnPtr.h"
36 #include "public/platform/WebVector.h" 35 #include "public/platform/WebVector.h"
37 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h" 36 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
38 37
38 #include <memory>
39
39 namespace blink { 40 namespace blink {
40 41
41 class WebURL; 42 class WebURL;
42 class WebServiceWorker; 43 class WebServiceWorker;
43 class WebServiceWorkerProviderClient; 44 class WebServiceWorkerProviderClient;
44 struct WebServiceWorkerError; 45 struct WebServiceWorkerError;
45 46
46 // Created on the main thread, and may be passed to another script context 47 // Created on the main thread, and may be passed to another script context
47 // thread (e.g. worker thread) later. All methods of this class must be called 48 // thread (e.g. worker thread) later. All methods of this class must be called
48 // on the single script context thread. 49 // on the single script context thread.
49 class WebServiceWorkerProvider { 50 class WebServiceWorkerProvider {
50 public: 51 public:
51 // Called when a client wants to start listening to the service worker 52 // Called when a client wants to start listening to the service worker
52 // events. Must be cleared before the client becomes invalid. 53 // events. Must be cleared before the client becomes invalid.
53 virtual void setClient(WebServiceWorkerProviderClient*) { } 54 virtual void setClient(WebServiceWorkerProviderClient*) { }
54 55
55 using WebServiceWorkerRegistrationCallbacks = WebCallbacks<WebPassOwnPtr<Web ServiceWorkerRegistration::Handle>, const WebServiceWorkerError&>; 56 using WebServiceWorkerRegistrationCallbacks = WebCallbacks<std::unique_ptr<W ebServiceWorkerRegistration::Handle>, const WebServiceWorkerError&>;
56 using WebServiceWorkerGetRegistrationCallbacks = WebCallbacks<WebPassOwnPtr< WebServiceWorkerRegistration::Handle>, const WebServiceWorkerError&>; 57 using WebServiceWorkerGetRegistrationCallbacks = WebCallbacks<std::unique_pt r<WebServiceWorkerRegistration::Handle>, const WebServiceWorkerError&>;
57 58
58 // Each element's ownership is transferred. 59 // Each element's ownership is transferred.
59 // TODO(yhirano): Consider using vector<std::unique_ptr<>>. 60 using WebServiceWorkerGetRegistrationsCallbacks = WebCallbacks<std::unique_p tr<WebVector<WebServiceWorkerRegistration::Handle*>>, const WebServiceWorkerErro r&>;
60 using WebServiceWorkerGetRegistrationsCallbacks = WebCallbacks<WebPassOwnPtr <WebVector<WebServiceWorkerRegistration::Handle*>>, const WebServiceWorkerError& >; 61 using WebServiceWorkerGetRegistrationForReadyCallbacks = WebCallbacks<std::u nique_ptr<WebServiceWorkerRegistration::Handle>, void>;
61 using WebServiceWorkerGetRegistrationForReadyCallbacks = WebCallbacks<WebPas sOwnPtr<WebServiceWorkerRegistration::Handle>, void>;
62 62
63 virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scri ptUrl, WebServiceWorkerRegistrationCallbacks*) { } 63 virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scri ptUrl, WebServiceWorkerRegistrationCallbacks*) { }
64 virtual void getRegistration(const WebURL& documentURL, WebServiceWorkerGetR egistrationCallbacks*) { } 64 virtual void getRegistration(const WebURL& documentURL, WebServiceWorkerGetR egistrationCallbacks*) { }
65 virtual void getRegistrations(WebServiceWorkerGetRegistrationsCallbacks*) { } 65 virtual void getRegistrations(WebServiceWorkerGetRegistrationsCallbacks*) { }
66 virtual void getRegistrationForReady(WebServiceWorkerGetRegistrationForReady Callbacks*) { } 66 virtual void getRegistrationForReady(WebServiceWorkerGetRegistrationForReady Callbacks*) { }
67 virtual bool validateScopeAndScriptURL(const WebURL& scope, const WebURL& sc riptURL, WebString* errorMessage) { return false; } 67 virtual bool validateScopeAndScriptURL(const WebURL& scope, const WebURL& sc riptURL, WebString* errorMessage) { return false; }
68 68
69 virtual ~WebServiceWorkerProvider() { } 69 virtual ~WebServiceWorkerProvider() { }
70 }; 70 };
71 71
72 } // namespace blink 72 } // namespace blink
73 73
74 #endif 74 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698