Commit 82eca6c2 authored by abarth@webkit.org's avatar abarth@webkit.org

2009-06-13 Nate Chapin <japhet@google.com>

        Reviewed by Dimitri Glazkov.  Landed by Adam Barth.

        Moved V8 Bindings for V8CustomXPathNSResolver to svn.webkit.org.

        https://bugs.webkit.org/show_bug.cgi?id=26227

        * bindings/v8/custom/V8CustomXPathNSResolver.cpp: Added.
        (WebCore::V8CustomXPathNSResolver::V8CustomXPathNSResolver): Moved from src.chromium.org.
        (WebCore::V8CustomXPathNSResolver::~V8CustomXPathNSResolver): Moved from src.chromium.org.
        (WebCore::V8CustomXPathNSResolver::lookupNamespaceURI): Moved from src.chromium.org.
        * bindings/v8/custom/V8CustomXPathNSResolver.h: Added.
        * bindings/v8/custom/V8DocumentCustom.cpp: Updated includes.
        (WebCore::CALLBACK_FUNC_DECL): Updated class name.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44658 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d32e9ac6
2009-06-13 Nate Chapin <japhet@google.com>
Reviewed by Dimitri Glazkov. Landed by Adam Barth.
Moved V8 Bindings for V8CustomXPathNSResolver to svn.webkit.org.
https://bugs.webkit.org/show_bug.cgi?id=26227
* bindings/v8/custom/V8CustomXPathNSResolver.cpp: Added.
(WebCore::V8CustomXPathNSResolver::V8CustomXPathNSResolver): Moved from src.chromium.org.
(WebCore::V8CustomXPathNSResolver::~V8CustomXPathNSResolver): Moved from src.chromium.org.
(WebCore::V8CustomXPathNSResolver::lookupNamespaceURI): Moved from src.chromium.org.
* bindings/v8/custom/V8CustomXPathNSResolver.h: Added.
* bindings/v8/custom/V8DocumentCustom.cpp: Updated includes.
(WebCore::CALLBACK_FUNC_DECL): Updated class name.
2009-06-13 Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Mark Rowe. Landed by Adam Barth.
// 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 "V8CustomXPathNSResolver.h"
#if ENABLE(XPATH)
#include "PlatformString.h"
#include "V8Binding.h"
#include "V8Proxy.h"
namespace WebCore {
V8CustomXPathNSResolver::V8CustomXPathNSResolver(v8::Handle<v8::Object> resolver)
: m_resolver(resolver)
{
}
V8CustomXPathNSResolver::~V8CustomXPathNSResolver()
{
}
String V8CustomXPathNSResolver::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);
}
} // namespace WebCore
#endif // ENABLE(XPATH)
/*
* Copyright (C) 2009 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.
*/
#ifndef V8CustomXPathNSResolver_h
#define V8CustomXPathNSResolver_h
#if ENABLE(XPATH)
#include <v8.h>
#include "XPathNSResolver.h"
namespace WebCore {
class String;
class V8CustomXPathNSResolver : public XPathNSResolver {
public:
V8CustomXPathNSResolver(v8::Handle<v8::Object> resolver);
virtual ~V8CustomXPathNSResolver();
virtual String lookupNamespaceURI(const String& prefix);
private:
v8::Handle<v8::Object> m_resolver; // Handle to resolver object.
};
} // namespace WebCore
#endif // ENABLE(XPATH)
#endif // V8CustomXPathNSResolver_h
......@@ -32,13 +32,13 @@
#include "Document.h"
#include "ExceptionCode.h"
#include "JSXPathNSResolver.h"
#include "Node.h"
#include "XPathNSResolver.h"
#include "XPathResult.h"
#include "V8Binding.h"
#include "V8CustomBinding.h"
#include "V8CustomXPathNSResolver.h"
#include "V8Node.h"
#include "V8Proxy.h"
#include "V8XPathNSResolver.h"
......@@ -63,7 +63,7 @@ CALLBACK_FUNC_DECL(DocumentEvaluate)
if (V8XPathNSResolver::HasInstance(args[2]))
resolver = V8Proxy::ToNativeObject<XPathNSResolver>(V8ClassIndex::XPATHNSRESOLVER, args[2]);
else if (args[2]->IsObject())
resolver = new JSXPathNSResolver(args[2]->ToObject());
resolver = new V8CustomXPathNSResolver(args[2]->ToObject());
else if (!args[2]->IsNull() && !args[2]->IsUndefined())
return throwError(TYPE_MISMATCH_ERR);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment