Pass through geofencing API calls to the content layer.

Source/modules/geofencing/Geofencing.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/GeofencingError.h"
+#include "modules/geofencing/GeofencingRegion.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebGeofencingProvider.h"
 
 namespace blink {
 
+namespace {
+
+class RegionArray {
+public:
+    typedef blink::WebVector<blink::WebGeofencingRegion> WebType;
+    static HeapVector<Member<GeofencingRegion> > take(ScriptPromiseResolver* resolver, WebType* regionsRaw)
+    {
+        OwnPtr<WebType> webRegions = adoptPtr(regionsRaw);

[abarth-chromium, 2014/08/23 05:43:34]

We try to push the adoptPtr as close to the API as possible so that we can have
leak / double-free protection inside Blink.

[Marijn Kruisselbrink, 2014/08/25 22:25:25]

This and the other comment about dispose seem more to be complaints about the
existence of CallbackPromiseAdapter than of my usage of it? As far as I can tell
my usage here is exactly as the "To use" section in the documentation for that
class.
(okay, I should probably add a comment indicating that this is implementing the
API CallbackPromiseAdapter requires)

+        HeapVector<Member<GeofencingRegion> > regions;
+        for (size_t i = 0; i < webRegions->size(); ++i) {
+            regions.append(GeofencingRegion::createFromWebRegion((*webRegions)[i]));

[abarth-chromium, 2014/08/23 05:43:34]

s/createFromWebRegion/create/

C++ can dispatch the call based on the type of the argument.

[Marijn Kruisselbrink, 2014/08/25 22:25:25]

Done.

+        }
+        return regions;
+    }
+
+    static void dispose(WebType* regionsRaw)
+    {
+        delete regionsRaw;
+    }

[abarth-chromium, 2014/08/23 05:43:34]

We shouldn't have this.  As soon as we get the region from the API, we should
call adoptPtr on it and we should let OwnPtr call |delete| for us.

[Marijn Kruisselbrink, 2014/08/25 22:25:25]

Same reply as to your comment on my ::take implementation. This seems to be a
complaint about CallbackPromiseAdapter, not about me using it.

+
+private:
+    RegionArray();
+};
+
+} // namespace
+
 Geofencing::Geofencing()
 {
     ScriptWrappable::init(this);
 }
 
 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(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