diff options
| -rw-r--r-- | V8Binding/V8Binding.derived.mk | 2 | ||||
| -rw-r--r-- | V8Binding/jni/jni_npobject.cpp | 8 | ||||
| -rw-r--r-- | V8Binding/npapi/npruntime.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/TemporaryLinkStubs.cpp | 10 | ||||
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 4 | ||||
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 49 |
6 files changed, 9 insertions, 66 deletions
diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk index f3e83d4..e0bb883 100644 --- a/V8Binding/V8Binding.derived.mk +++ b/V8Binding/V8Binding.derived.mk @@ -75,6 +75,8 @@ WEBCORE_SRC_FILES := \ bindings/v8/WorkerContextExecutionProxy.cpp \ bindings/v8/WorkerScriptController.cpp \ \ + bindings/v8/npruntime.cpp \ + \ bindings/v8/custom/V8AbstractWorkerCustom.cpp \ bindings/v8/custom/V8AttrCustom.cpp \ bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \ diff --git a/V8Binding/jni/jni_npobject.cpp b/V8Binding/jni/jni_npobject.cpp index d826826..3765452 100644 --- a/V8Binding/jni/jni_npobject.cpp +++ b/V8Binding/jni/jni_npobject.cpp @@ -86,7 +86,7 @@ bool JavaNPObject_HasMethod(NPObject* obj, NPIdentifier identifier) { JavaInstance* instance = ExtractJavaInstance(obj); if (instance == 0) return false; - NPUTF8* name = NPN_UTF8FromIdentifier(identifier); + NPUTF8* name = _NPN_UTF8FromIdentifier(identifier); if (name == 0) return false; @@ -103,7 +103,7 @@ bool JavaNPObject_Invoke(NPObject* obj, NPIdentifier identifier, JavaInstance* instance = ExtractJavaInstance(obj); if (instance == 0) return false; - NPUTF8* name = NPN_UTF8FromIdentifier(identifier); + NPUTF8* name = _NPN_UTF8FromIdentifier(identifier); if (name == 0) return false; @@ -119,7 +119,7 @@ bool JavaNPObject_HasProperty(NPObject* obj, NPIdentifier identifier) { JavaInstance* instance = ExtractJavaInstance(obj); if (instance == 0) return false; - NPUTF8* name = NPN_UTF8FromIdentifier(identifier); + NPUTF8* name = _NPN_UTF8FromIdentifier(identifier); if (name == 0) return false; bool result = instance->getClass()->fieldNamed(name) != 0; @@ -132,7 +132,7 @@ bool JavaNPObject_GetProperty(NPObject* obj, NPIdentifier identifier, NPVariant* JavaInstance* instance = ExtractJavaInstance(obj); if (instance == 0) return false; - NPUTF8* name = NPN_UTF8FromIdentifier(identifier); + NPUTF8* name = _NPN_UTF8FromIdentifier(identifier); if (name == 0) return false; diff --git a/V8Binding/npapi/npruntime.h b/V8Binding/npapi/npruntime.h index 8a285be..ec26680 100644 --- a/V8Binding/npapi/npruntime.h +++ b/V8Binding/npapi/npruntime.h @@ -221,7 +221,7 @@ bool NPN_IdentifierIsString(NPIdentifier identifier); /* The NPUTF8 returned from NPN_UTF8FromIdentifier SHOULD be freed. */ -NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier); +NPUTF8 *_NPN_UTF8FromIdentifier(NPIdentifier identifier); /* Get the integer represented by identifier. If identifier is not an diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index b68a74c..f9ab682 100644 --- a/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -424,11 +424,6 @@ Vector<String> supportedKeySizes() return Vector<String>(); } -String signedPublicKeyAndChallengeString(unsigned int, String const&, WebCore::KURL const&) -{ - return String(); -} - } // namespace WebCore namespace WebCore { @@ -483,11 +478,6 @@ void prefetchDNS(const String&) notImplemented(); } -void getSupportedKeySizes(Vector<String>&) -{ - notImplemented(); -} - PassRefPtr<Icon> Icon::createIconForFile(const String&) { notImplemented(); diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 8440239..c6b0cae 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -1217,12 +1217,12 @@ static const char* MozillaUserAgent = "Mozilla/5.0 (" const char* PluginView::userAgent() { +#if !PLATFORM(ANDROID) if (m_plugin->quirks().contains(PluginQuirkWantsMozillaUserAgent)) return MozillaUserAgent; - +#endif if (m_userAgent.isNull()) m_userAgent = m_parentFrame->loader()->userAgent(m_url).utf8(); - return m_userAgent.data(); } diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index 022fa35..bb0212b 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -398,55 +398,6 @@ void PluginView::setNPWindowRect(const IntRect& rect) m_window->setWindow(&m_npWindow, m_isTransparent); } -void PluginView::stop() -{ - if (!m_isStarted) - return; - - HashSet<RefPtr<PluginStream> > streams = m_streams; - HashSet<RefPtr<PluginStream> >::iterator end = streams.end(); - for (HashSet<RefPtr<PluginStream> >::iterator it = streams.begin(); it != end; ++it) { - (*it)->stop(); - disconnectStream((*it).get()); - } - - ASSERT(m_streams.isEmpty()); - - m_isStarted = false; -#if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(false); -#endif - - PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance); - - // Destroy the plugin - NPSavedData* savedData = 0; - setCallingPlugin(true); - NPError npErr = m_plugin->pluginFuncs()->destroy(m_instance, &savedData); - setCallingPlugin(false); - LOG_NPERROR(npErr); - - if (savedData) { - if (savedData->buf) - NPN_MemFree(savedData->buf); - NPN_MemFree(savedData); - } - - m_instance->pdata = 0; -} - -const char* PluginView::userAgentStatic() -{ - return 0; -} - -const char* PluginView::userAgent() -{ - if (m_userAgent.isNull()) - m_userAgent = m_parentFrame->loader()->userAgent(m_url).utf8(); - return m_userAgent.data(); -} - NPError PluginView::getValue(NPNVariable variable, void* value) { switch (variable) { |