diff options
Diffstat (limited to 'WebCore/bindings')
7 files changed, 328 insertions, 10 deletions
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 + } diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index 5943e69..7ed1c46 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -811,11 +811,6 @@ void V8Proxy::createUtilityContext() bool V8Proxy::sourceLineNumber(int& result) { -#if PLATFORM(ANDROID) - // TODO(andreip): consider V8's DEBUG flag here, rather than PLATFORM(ANDROID) - // or, even better, the WEBKIT inspector flag. - return 0; -#else v8::HandleScope scope; v8::Handle<v8::Context> v8UtilityContext = V8Proxy::utilityContext(); if (v8UtilityContext.IsEmpty()) @@ -830,14 +825,10 @@ bool V8Proxy::sourceLineNumber(int& result) return false; result = value->Int32Value(); return true; -#endif } bool V8Proxy::sourceName(String& result) { -#if PLATFORM(ANDROID) - return false; -#else v8::HandleScope scope; v8::Handle<v8::Context> v8UtilityContext = utilityContext(); if (v8UtilityContext.IsEmpty()) @@ -852,7 +843,6 @@ bool V8Proxy::sourceName(String& result) return false; result = toWebCoreString(value); return true; -#endif } void V8Proxy::registerExtensionWithV8(v8::Extension* extension) diff --git a/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.cpp b/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.cpp new file mode 100644 index 0000000..af57b15 --- /dev/null +++ b/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.cpp @@ -0,0 +1,70 @@ +/* + * 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 "V8CustomApplicationInstalledCallback.h" + +#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) + +#include "Frame.h" +#include "V8CustomVoidCallback.h" // For invokeCallback + +namespace WebCore { + +V8CustomApplicationInstalledCallback::V8CustomApplicationInstalledCallback(v8::Local<v8::Object> callback, Frame* frame) + : m_callback(v8::Persistent<v8::Object>::New(callback)) + , m_frame(frame) +{ +} + +V8CustomApplicationInstalledCallback::~V8CustomApplicationInstalledCallback() +{ + m_callback.Dispose(); +} + +void V8CustomApplicationInstalledCallback::handleEvent(bool isInstalled) +{ + v8::HandleScope handleScope; + + v8::Handle<v8::Context> context = V8Proxy::context(m_frame.get()); + if (context.IsEmpty()) + return; + + v8::Context::Scope scope(context); + + v8::Handle<v8::Value> argv[] = { + v8::Boolean::New(isInstalled) + }; + + // Protect the frame until the callback returns. + RefPtr<Frame> protector(m_frame); + + bool callbackReturnValue = false; + invokeCallback(m_callback, 1, argv, callbackReturnValue); +} + +} // namespace WebCore + +#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) diff --git a/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.h b/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.h new file mode 100644 index 0000000..3bdd2ac --- /dev/null +++ b/WebCore/bindings/v8/custom/V8CustomApplicationInstalledCallback.h @@ -0,0 +1,61 @@ +/* + * 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 V8CustomApplicationInstalledCallback_h +#define V8CustomApplicationInstalledCallback_h + +#include "ApplicationInstalledCallback.h" +#include <v8.h> +#include <wtf/PassRefPtr.h> +#include <wtf/RefPtr.h> + +namespace WebCore { + +class Frame; + +class V8CustomApplicationInstalledCallback : public ApplicationInstalledCallback { +public: + static PassRefPtr<V8CustomApplicationInstalledCallback> create(v8::Local<v8::Value> value, Frame* frame) + { + ASSERT(value->IsObject()); + return adoptRef(new V8CustomApplicationInstalledCallback(value->ToObject(), frame)); + } + virtual ~V8CustomApplicationInstalledCallback(); + + virtual void handleEvent(bool isInstalled); + +private: + V8CustomApplicationInstalledCallback(v8::Local<v8::Object>, Frame*); + + v8::Persistent<v8::Object> m_callback; + RefPtr<Frame> m_frame; +}; + +} // namespace WebCore + +#endif // V8CustomApplicationInstalledCallback_h + +#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) diff --git a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp index 266745d..c3c406e 100644 --- a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp +++ b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp @@ -32,6 +32,12 @@ #include "V8Navigator.h" #include "RuntimeEnabledFeatures.h" +#include "V8Binding.h" +#include "V8Proxy.h" + +#if PLATFORM(ANDROID) +#include "V8CustomApplicationInstalledCallback.h" +#endif namespace WebCore { @@ -42,4 +48,46 @@ bool V8Navigator::GeolocationEnabled() } #endif +#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) + +static PassRefPtr<ApplicationInstalledCallback> createApplicationInstalledCallback( + v8::Local<v8::Value> value, bool& succeeded) +{ + succeeded = true; + + if (!value->IsFunction()) { + succeeded = false; + throwError("The second argument should be a function"); + return 0; + } + + Frame* frame = V8Proxy::retrieveFrameForCurrentContext(); + return V8CustomApplicationInstalledCallback::create(value, frame); +} + +v8::Handle<v8::Value> V8Navigator::isApplicationInstalledCallback(const v8::Arguments& args) +{ + INC_STATS("DOM.isApplicationInstalled()"); + bool succeeded = false; + + if (args.Length() < 2) + return throwError("Two arguments required: an application name and a callback.", V8Proxy::SyntaxError); + + if (!args[0]->IsString()) + return throwError("The first argument should be a string."); + + RefPtr<ApplicationInstalledCallback> callback = + createApplicationInstalledCallback(args[1], succeeded); + if (!succeeded) + return v8::Undefined(); + + ASSERT(callback); + + Navigator* navigator = V8Navigator::toNative(args.Holder()); + navigator->isApplicationInstalled(toWebCoreString(args[0]), callback.release()); + return v8::Undefined(); +} + +#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) + } // namespace WebCore |