diff options
| -rw-r--r-- | V8Binding/V8Binding.derived.mk | 1 | ||||
| -rw-r--r-- | V8Binding/binding/JSXPathNSResolver.cpp | 90 | ||||
| -rw-r--r-- | V8Binding/binding/JSXPathNSResolver.h | 33 | ||||
| -rw-r--r-- | WebCore/Android.derived.mk | 5 | ||||
| -rw-r--r-- | WebCore/Android.mk | 2 |
5 files changed, 0 insertions, 131 deletions
diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk index 620c119..aec9982 100644 --- a/V8Binding/V8Binding.derived.mk +++ b/V8Binding/V8Binding.derived.mk @@ -102,7 +102,6 @@ WEBCORE_SRC_FILES := \ bindings/v8/custom/V8CustomSQLTransactionCallback.cpp \ bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp \ bindings/v8/custom/V8CustomVoidCallback.cpp \ - bindings/v8/custom/V8CustomXPathNSResolver.cpp \ bindings/v8/custom/V8DOMApplicationCacheCustom.cpp \ bindings/v8/custom/V8DOMParserConstructor.cpp \ bindings/v8/custom/V8DOMWindowCustom.cpp \ diff --git a/V8Binding/binding/JSXPathNSResolver.cpp b/V8Binding/binding/JSXPathNSResolver.cpp deleted file mode 100644 index 5174809..0000000 --- a/V8Binding/binding/JSXPathNSResolver.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (c) 2008, Google Inc. -// All rights reserved. -// -// 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. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "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 "JSXPathNSResolver.h" - -#if ENABLE(XPATH) - -#include "v8_proxy.h" -#include "v8_binding.h" -#include "PlatformString.h" - -namespace WebCore { - -JSXPathNSResolver::JSXPathNSResolver(v8::Handle<v8::Object> resolver) -: m_resolver(resolver) { -} - -JSXPathNSResolver::~JSXPathNSResolver() { -} - -String JSXPathNSResolver::lookupNamespaceURI(const String& prefix) { - v8::Handle<v8::Function> lookupNamespaceURIFunc; - v8::Handle<v8::String> lookupNamespaceURIName = v8::String::New("lookupNamespaceURI"); - - // Check if the resolver has a function property named lookupNamespaceURI. - if (m_resolver->Has(lookupNamespaceURIName)) { - v8::Handle<v8::Value> lookupNamespaceURI = m_resolver->Get(lookupNamespaceURIName); - if (lookupNamespaceURI->IsFunction()) { - lookupNamespaceURIFunc = v8::Handle<v8::Function>::Cast(lookupNamespaceURI); - } - } - - if (lookupNamespaceURIFunc.IsEmpty() && !m_resolver->IsFunction()) { - Frame* frame = V8Proxy::retrieveFrameForEnteredContext(); - log_info(frame, "XPathNSResolver does not have a lookupNamespaceURI method.", String()); - return String(); - } - - // Catch exceptions from calling the namespace resolver. - v8::TryCatch try_catch; - try_catch.SetVerbose(true); // Print exceptions to console. - - const int argc = 1; - v8::Handle<v8::Value> argv[argc] = { v8String(prefix) }; - v8::Handle<v8::Function> function = lookupNamespaceURIFunc.IsEmpty() - ? v8::Handle<v8::Function>::Cast(m_resolver) - : lookupNamespaceURIFunc; - - V8Proxy* proxy = V8Proxy::retrieve(); - v8::Handle<v8::Value> retval = proxy->CallFunction(function, m_resolver, argc, argv); - - // Eat exceptions from namespace resolver and return an empty string. This - // will most likely cause NAMESPACE_ERR. - if (try_catch.HasCaught()) { - return String(); - } - - return valueToStringWithNullCheck(retval); -} - -} - -#endif // ENABLE(XPATH) diff --git a/V8Binding/binding/JSXPathNSResolver.h b/V8Binding/binding/JSXPathNSResolver.h deleted file mode 100644 index f0c340c..0000000 --- a/V8Binding/binding/JSXPathNSResolver.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2006-2008 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. - -#ifndef JSXPATHNSRESOLVER_H__ -#define JSXPATHNSRESOLVER_H__ - -#if ENABLE(XPATH) - -#include <v8.h> -#include <wtf/RefCounted.h> -#include "XPathNSResolver.h" - -namespace WebCore { - - class String; - - class JSXPathNSResolver : public XPathNSResolver { - public: - - JSXPathNSResolver(v8::Handle<v8::Object> resolver); - virtual ~JSXPathNSResolver(); - - virtual String lookupNamespaceURI(const String& prefix); - - private: - v8::Handle<v8::Object> m_resolver; // Handle to resolver object. - }; -} - -#endif // ENABLE(XPATH) - -#endif // JSXPATHNSRESOLVER_H__ diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 7a5cd0a..a992811 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -721,11 +721,6 @@ GEN := \ $(intermediates)/xml/JSXMLHttpRequestProgressEvent.h \ $(intermediates)/xml/JSXMLHttpRequestUpload.h \ $(intermediates)/xml/JSXMLSerializer.h \ - $(intermediates)/xml/JSXPathEvaluator.h \ - $(intermediates)/xml/JSXPathException.h \ - $(intermediates)/xml/JSXPathExpression.h \ - $(intermediates)/xml/JSXPathNSResolver.h \ - $(intermediates)/xml/JSXPathResult.h \ $(intermediates)/xml/JSXSLTProcessor.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 52fba89..7afe803 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -162,7 +162,6 @@ LOCAL_SRC_FILES := \ bindings/js/JSCustomSQLTransactionCallback.cpp \ bindings/js/JSCustomSQLTransactionErrorCallback.cpp \ bindings/js/JSCustomVoidCallback.cpp \ - bindings/js/JSCustomXPathNSResolver.cpp \ bindings/js/JSDesktopNotificationsCustom.cpp \ bindings/js/JSDOMApplicationCacheCustom.cpp \ bindings/js/JSDOMBinding.cpp \ @@ -1189,7 +1188,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ workers/WorkerThread.cpp \ \ xml/DOMParser.cpp \ - xml/NativeXPathNSResolver.cpp \ xml/XMLHttpRequest.cpp \ xml/XMLHttpRequestUpload.cpp \ xml/XMLSerializer.cpp |