Index: Source/modules/geofencing/Geofencing.cpp |
diff --git a/Source/modules/geofencing/Geofencing.cpp b/Source/modules/geofencing/Geofencing.cpp |
index 59d8b975755550e0b2f48b7a08e7fda81d16acc8..08dff14c73611b094ba16cc39b3ab736424bcf47 100644 |
--- a/Source/modules/geofencing/Geofencing.cpp |
+++ b/Source/modules/geofencing/Geofencing.cpp |
@@ -5,12 +5,47 @@ |
#include "config.h" |
#include "modules/geofencing/Geofencing.h" |
+#include "bindings/core/v8/CallbackPromiseAdapter.h" |
#include "bindings/core/v8/ScriptPromise.h" |
+#include "bindings/core/v8/ScriptPromiseResolver.h" |
#include "core/dom/DOMException.h" |
#include "core/dom/ExceptionCode.h" |
+#include "modules/geofencing/CircularGeofencingRegion.h" |
+#include "modules/geofencing/GeofencingError.h" |
+#include "modules/geofencing/GeofencingRegion.h" |
+#include "public/platform/Platform.h" |
+#include "public/platform/WebCircularGeofencingRegion.h" |
+#include "public/platform/WebGeofencingProvider.h" |
namespace blink { |
+namespace { |
+ |
+// For CallbackPromiseAdapter to convert a WebVector of regions to a HeapVector. |
+class RegionArray { |
+public: |
+ typedef blink::WebVector<blink::WebCircularGeofencingRegion> WebType; |
+ static HeapVector<Member<GeofencingRegion> > take(ScriptPromiseResolver* resolver, WebType* regionsRaw) |
+ { |
+ OwnPtr<WebType> webRegions = adoptPtr(regionsRaw); |
+ HeapVector<Member<GeofencingRegion> > regions; |
+ for (size_t i = 0; i < webRegions->size(); ++i) { |
jochen (gone - plz use gerrit)
2014/09/04 11:14:54
nit, no { }
Marijn Kruisselbrink
2014/09/04 17:44:19
Done.
|
+ regions.append(CircularGeofencingRegion::create((*webRegions)[i])); |
+ } |
+ return regions; |
+ } |
+ |
+ static void dispose(WebType* regionsRaw) |
+ { |
+ delete regionsRaw; |
+ } |
+ |
+private: |
+ RegionArray(); |
+}; |
+ |
+} // namespace |
+ |
Geofencing::Geofencing() |
{ |
ScriptWrappable::init(this); |
@@ -18,17 +53,41 @@ Geofencing::Geofencing() |
ScriptPromise Geofencing::registerRegion(ScriptState* scriptState, GeofencingRegion* region) |
{ |
- return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ WebGeofencingProvider* provider = Platform::current()->geofencingProvider(); |
+ if (!provider) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ |
+ RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ // FIXME: somehow pass a reference to the current serviceworker to the provider. |
+ provider->registerRegion(toCircularGeofencingRegion(region)->webRegion(), new CallbackPromiseAdapter<void, GeofencingError>(resolver)); |
+ return promise; |
} |
ScriptPromise Geofencing::unregisterRegion(ScriptState* scriptState, const String& regionId) |
{ |
- return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ WebGeofencingProvider* provider = Platform::current()->geofencingProvider(); |
+ if (!provider) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ |
+ RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ // FIXME: somehow pass a reference to the current serviceworker to the provider. |
+ provider->unregisterRegion(regionId, new CallbackPromiseAdapter<void, GeofencingError>(resolver)); |
+ return promise; |
} |
ScriptPromise Geofencing::getRegisteredRegions(ScriptState* scriptState) const |
{ |
- return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ WebGeofencingProvider* provider = Platform::current()->geofencingProvider(); |
+ if (!provider) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError)); |
+ |
+ RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ // FIXME: somehow pass a reference to the current serviceworker to the provider. |
+ provider->getRegisteredRegions(new CallbackPromiseAdapter<RegionArray, GeofencingError>(resolver)); |
+ return promise; |
} |
} // namespace blink |