Index: public/platform/modules/background_sync/WebSyncProvider.h |
diff --git a/public/platform/modules/background_sync/WebSyncProvider.h b/public/platform/modules/background_sync/WebSyncProvider.h |
index 36132b1a89730f8040a475ee81c0ffcbd18772e7..5f1ff0ad688ea91d59ddaa85cde2a07bb44b96c2 100644 |
--- a/public/platform/modules/background_sync/WebSyncProvider.h |
+++ b/public/platform/modules/background_sync/WebSyncProvider.h |
@@ -7,6 +7,7 @@ |
#include "public/platform/WebCallbacks.h" |
#include "public/platform/WebCommon.h" |
+#include "public/platform/WebPassOwnPtr.h" |
#include "public/platform/WebString.h" |
#include "public/platform/WebVector.h" |
#include "public/platform/modules/background_sync/WebSyncError.h" |
@@ -16,12 +17,78 @@ |
namespace blink { |
class WebServiceWorkerRegistration; |
+template <> |
+class WebCallbacks<WebPassOwnPtr<WebSyncRegistration>, const WebSyncError&> { |
+public: |
+ virtual ~WebCallbacks() {} |
+ void onSuccess(WebSyncRegistration* r) { onSuccess(adoptWebPtr(r)); } |
+ void onError(WebSyncError* e) |
+ { |
+ onError(*e); |
+ delete e; |
+ } |
+ virtual void onSuccess(WebPassOwnPtr<WebSyncRegistration>) = 0; |
+ virtual void onError(const WebSyncError&) = 0; |
+}; |
+using WebSyncRegistrationCallbacks = WebCallbacks<WebPassOwnPtr<WebSyncRegistration>, const WebSyncError&>; |
+ |
+template <> |
+class WebCallbacks<bool, const WebSyncError&> { |
+public: |
+ virtual ~WebCallbacks() {} |
+ void onSuccess(bool* r) |
+ { |
+ onSuccess(*r); |
+ delete r; |
+ } |
+ void onError(WebSyncError* e) |
+ { |
+ onError(*e); |
+ delete e; |
+ } |
+ virtual void onSuccess(bool) = 0; |
+ virtual void onError(const WebSyncError&) = 0; |
+}; |
+using WebSyncNotifyWhenDoneCallbacks = WebCallbacks<bool, const WebSyncError&>; |
+using WebSyncUnregistrationCallbacks = WebCallbacks<bool, const WebSyncError&>; |
+ |
+template <> |
+class WebCallbacks<const WebVector<WebSyncRegistration*>&, const WebSyncError&> { |
+public: |
+ virtual ~WebCallbacks() {} |
+ void onSuccess(WebVector<WebSyncRegistration*>* r) |
+ { |
+ onSuccess(*r); |
+ delete r; |
+ } |
+ void onError(WebSyncError* e) |
+ { |
+ onError(*e); |
+ delete e; |
+ } |
+ virtual void onSuccess(const WebVector<WebSyncRegistration*>&) = 0; |
+ virtual void onError(const WebSyncError&) = 0; |
+}; |
+using WebSyncGetRegistrationsCallbacks = WebCallbacks<const WebVector<WebSyncRegistration*>&, const WebSyncError&>; |
-using WebSyncRegistrationCallbacks = WebCallbacks<WebSyncRegistration*, WebSyncError*>; |
-using WebSyncNotifyWhenDoneCallbacks = WebCallbacks<bool*, WebSyncError*>; |
-using WebSyncUnregistrationCallbacks = WebCallbacks<bool*, WebSyncError*>; |
-using WebSyncGetRegistrationsCallbacks = WebCallbacks<WebVector<WebSyncRegistration*>*, WebSyncError*>; |
-using WebSyncGetPermissionStatusCallbacks = WebCallbacks<WebSyncPermissionStatus*, WebSyncError*>; |
+template <> |
+class WebCallbacks<WebSyncPermissionStatus, const WebSyncError&> { |
+public: |
+ virtual ~WebCallbacks() {} |
+ void onSuccess(WebSyncPermissionStatus* r) |
+ { |
+ onSuccess(*r); |
+ delete r; |
+ } |
+ void onError(WebSyncError* e) |
+ { |
+ onError(*e); |
+ delete e; |
+ } |
+ virtual void onSuccess(WebSyncPermissionStatus) = 0; |
+ virtual void onError(const WebSyncError&) = 0; |
+}; |
+using WebSyncGetPermissionStatusCallbacks = WebCallbacks<WebSyncPermissionStatus, const WebSyncError&>; |
class WebSyncProvider { |
public: |