Merge "Implement navigator.isApplicationInstalled() API"

5 files changed, 151 insertions, 1 deletions

diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 067aa0c..4ba1874 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -49,7 +49,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
 			bindings/scripts/generate-bindings.pl \
 		)
 
-FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CONNECTION=1
+FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1
 
 # CSS
 GEN := \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 0802db7..a0a47d5 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -74,6 +74,7 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSClipboardCustom.cpp \
 	bindings/js/JSConsoleCustom.cpp \
 	bindings/js/JSCoordinatesCustom.cpp \
+	bindings/js/JSCustomApplicationInstalledCallback.cpp \
 	bindings/js/JSCustomPositionCallback.cpp \
 	bindings/js/JSCustomPositionErrorCallback.cpp \
 	bindings/js/JSCustomSQLStatementCallback.cpp \
diff --git a/WebCore/bindings/js/JSCustomApplicationInstalledCallback.cpp b/WebCore/bindings/js/JSCustomApplicationInstalledCallback.cpp
new file mode 100644
index 0000000..37152b8
--- /dev/null
+++ b/WebCore/bindings/js/JSCustomApplicationInstalledCallback.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSCustomApplicationInstalledCallback.h"
+
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+
+#include "ScriptController.h"
+#include <runtime/JSLock.h>
+
+namespace WebCore {
+
+using namespace JSC;
+
+JSCustomApplicationInstalledCallback::JSCustomApplicationInstalledCallback(JSObject* callback, JSDOMGlobalObject* globalObject)
+    : m_data(callback, globalObject)
+{
+}
+
+void JSCustomApplicationInstalledCallback::handleEvent(bool isInstalled)
+{
+    RefPtr<JSCustomApplicationInstalledCallback> protect(this);
+
+    JSC::JSLock lock(SilenceAssertionsOnly);
+    ExecState* exec = m_data.globalObject()->globalExec();
+    MarkedArgumentBuffer args;
+    args.append(jsBoolean(isInstalled));
+    m_data.invokeCallback(args);
+}
+
+} // namespace WebCore
+
+#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
diff --git a/WebCore/bindings/js/JSCustomApplicationInstalledCallback.h b/WebCore/bindings/js/JSCustomApplicationInstalledCallback.h
new file mode 100644
index 0000000..d5057a9
--- /dev/null
+++ b/WebCore/bindings/js/JSCustomApplicationInstalledCallback.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+
+#ifndef JSCustomApplicationInstalledCallback_h
+#define JSCustomApplicationInstalledCallback_h
+
+#include "ApplicationInstalledCallback.h"
+#include "JSCallbackData.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
+
+namespace WebCore {
+
+class JSCustomApplicationInstalledCallback : public ApplicationInstalledCallback {
+public:
+    static PassRefPtr<JSCustomApplicationInstalledCallback> create(JSC::JSObject* callback, JSDOMGlobalObject* globalObject)
+    {
+        return adoptRef(new JSCustomApplicationInstalledCallback(callback, globalObject));
+    }
+
+    virtual void handleEvent(bool isInstalled);
+
+private:
+    JSCustomApplicationInstalledCallback(JSC::JSObject* callback, JSDOMGlobalObject* globalObject);
+
+    JSCallbackData m_data;
+};
+
+} // namespace WebCore
+
+#endif // JSCustomApplicationInstalledCallback_h
+
+#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
diff --git a/WebCore/bindings/js/JSNavigatorCustom.cpp b/WebCore/bindings/js/JSNavigatorCustom.cpp
index c023931..b30db5a 100644
--- a/WebCore/bindings/js/JSNavigatorCustom.cpp
+++ b/WebCore/bindings/js/JSNavigatorCustom.cpp
@@ -23,7 +23,13 @@
 #include "config.h"
 #include "JSNavigator.h"
 
+#include "ExceptionCode.h"
 #include "Navigator.h"
+#include <runtime/InternalFunction.h>
+
+#if PLATFORM(ANDROID)
+#include "JSCustomApplicationInstalledCallback.h"
+#endif
 
 namespace WebCore {
 
@@ -38,4 +44,35 @@ void JSNavigator::markChildren(MarkStack& markStack)
     markDOMObjectWrapper(markStack, globalData, impl()->optionalGeolocation());
 }
 
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+
+JSC::JSValue  WebCore::JSNavigator::isApplicationInstalled(JSC::ExecState* exec, JSC::ArgList const& args)
+{
+    if (args.size() < 2) {
+        setDOMException(exec, SYNTAX_ERR);
+        return jsUndefined();
+    }
+
+    if (!args.at(1).inherits(&InternalFunction::info)) {
+        setDOMException(exec, TYPE_MISMATCH_ERR);
+        return jsUndefined();
+    }
+
+    String appName = args.at(0).toString(exec);
+
+    JSObject* object;
+    if (!(object = args.at(1).getObject())) {
+        setDOMException(exec, TYPE_MISMATCH_ERR);
+        return jsUndefined();
+    }
+
+    RefPtr<ApplicationInstalledCallback> callback(JSCustomApplicationInstalledCallback::create(
+            object, static_cast<JSDOMGlobalObject*>(exec->dynamicGlobalObject())));
+
+    m_impl->isApplicationInstalled(appName, callback.release());
+    return jsUndefined();
+}
+
+#endif
+
 }