diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 20:11:40 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:43 +0100 |
| commit | f3dcd63b78bb179134cb7f0a4c9ec20b71242f9d (patch) | |
| tree | dad594c017cf37ebd674bf654130133289e411c6 | |
| parent | c3109bb2893308e202242b132d7d912bb9799e43 (diff) | |
| download | external_webkit-f3dcd63b78bb179134cb7f0a4c9ec20b71242f9d.zip external_webkit-f3dcd63b78bb179134cb7f0a4c9ec20b71242f9d.tar.gz external_webkit-f3dcd63b78bb179134cb7f0a4c9ec20b71242f9d.tar.bz2 | |
Merge WebKit at r67178 : Cherry-pick fix for V8DOMWrapper.
Copying http://trac.webkit.org/changeset/67324, which fixes a
circular header file inclusion when compiling with both XPATH
and V8 enabled (which is our default build config).
Change-Id: I244870c2b612314ac2c6248eeeb1c8dc5e5b362b
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.cpp | 13 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWrapper.h | 10 |
2 files changed, 14 insertions, 9 deletions
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 7d7efe5..e7a8142 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -449,4 +449,17 @@ PassRefPtr<EventListener> V8DOMWrapper::getEventListener(v8::Local<v8::Value> va #endif } +#if ENABLE(XPATH) +// XPath-related utilities +RefPtr<XPathNSResolver> V8DOMWrapper::getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy) +{ + RefPtr<XPathNSResolver> resolver; + if (V8XPathNSResolver::HasInstance(value)) + resolver = V8XPathNSResolver::toNative(v8::Handle<v8::Object>::Cast(value)); + else if (value->IsObject()) + resolver = V8CustomXPathNSResolver::create(value->ToObject()); + return resolver; +} +#endif + } // namespace WebCore diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h index ed02743..be42aa4 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.h +++ b/WebCore/bindings/v8/V8DOMWrapper.h @@ -93,15 +93,7 @@ namespace WebCore { #if ENABLE(XPATH) // XPath-related utilities - static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy = 0) - { - RefPtr<XPathNSResolver> resolver; - if (V8XPathNSResolver::HasInstance(value)) - resolver = V8XPathNSResolver::toNative(v8::Handle<v8::Object>::Cast(value)); - else if (value->IsObject()) - resolver = V8CustomXPathNSResolver::create(value->ToObject()); - return resolver; - } + static RefPtr<XPathNSResolver> getXPathNSResolver(v8::Handle<v8::Value> value, V8Proxy* proxy = 0); #endif // Wrap JS node filter in C++. |