diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 14:30:19 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | 0a06e7e772d95238accdb0139e5069b3e75091b1 (patch) | |
| tree | 7b5f409adc9dac5ac5eb66f265099ae196ecf547 | |
| parent | 01eb58e0c8da43223275f0eb2a1e4691125405d1 (diff) | |
| download | external_webkit-0a06e7e772d95238accdb0139e5069b3e75091b1.zip external_webkit-0a06e7e772d95238accdb0139e5069b3e75091b1.tar.gz external_webkit-0a06e7e772d95238accdb0139e5069b3e75091b1.tar.bz2 | |
Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cpp
This file has been deleted upstream now that more V8 bindings are
auto-generated, but we have local modifications, so we must keep these parts.
Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8NavigatorCustom.cpp | 26 |
2 files changed, 5 insertions, 22 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index b7a5038..9d26939 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -151,6 +151,7 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8MessageEventCustom.cpp \ bindings/v8/custom/V8NamedNodeMapCustom.cpp \ bindings/v8/custom/V8NamedNodesCollection.cpp \ + bindings/v8/custom/V8NavigatorCustom.cpp \ bindings/v8/custom/V8NodeCustom.cpp \ bindings/v8/custom/V8NodeFilterCustom.cpp \ bindings/v8/custom/V8NodeIteratorCustom.cpp \ diff --git a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp index ae330fb..e5a6909 100644 --- a/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp +++ b/WebCore/bindings/v8/custom/V8NavigatorCustom.cpp @@ -31,33 +31,15 @@ #include "config.h" #include "V8Navigator.h" -#include "RuntimeEnabledFeatures.h" -#include "V8DOMWindow.h" -#include "V8DOMWrapper.h" +#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) -#if PLATFORM(ANDROID) #include "ExceptionCode.h" #include "V8CustomApplicationInstalledCallback.h" +#include "V8Binding.h" #include "V8Proxy.h" -#endif namespace WebCore { -v8::Handle<v8::Value> toV8(Navigator* impl) -{ - if (!impl) - return v8::Null(); - v8::Handle<v8::Object> wrapper = getDOMObjectMap().get(impl); - if (wrapper.IsEmpty()) { - wrapper = V8Navigator::wrap(impl); - if (!wrapper.IsEmpty()) - V8DOMWrapper::setHiddenWindowReference(impl->frame(), V8DOMWindow::navigatorIndex, wrapper); - } - return wrapper; -} - -#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) - static PassRefPtr<ApplicationInstalledCallback> createApplicationInstalledCallback( v8::Local<v8::Value> value, bool& succeeded) { @@ -98,6 +80,6 @@ v8::Handle<v8::Value> V8Navigator::isApplicationInstalledCallback(const v8::Argu return v8::Undefined(); } -#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) - } // namespace WebCore + +#endif // PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) |