X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fbindings%2Fv8%2Fcustom%2FV8CustomXPathNSResolver.cpp;h=bf23ad34f3ad1da8ae5119ae198f0fc10d1f6dbe;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=79a5aa38c513bf82cbd76ddc4dacb2e17102fdac;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/bindings/v8/custom/V8CustomXPathNSResolver.cpp b/src/third_party/WebKit/Source/bindings/v8/custom/V8CustomXPathNSResolver.cpp index 79a5aa3..bf23ad3 100644 --- a/src/third_party/WebKit/Source/bindings/v8/custom/V8CustomXPathNSResolver.cpp +++ b/src/third_party/WebKit/Source/bindings/v8/custom/V8CustomXPathNSResolver.cpp @@ -34,9 +34,9 @@ #include "bindings/v8/V8Binding.h" #include "core/dom/ExecutionContext.h" #include "core/frame/DOMWindow.h" +#include "core/frame/FrameConsole.h" #include "core/frame/FrameHost.h" #include "core/frame/LocalFrame.h" -#include "core/frame/PageConsole.h" #include "core/inspector/ScriptCallStack.h" #include "wtf/text/WTFString.h" @@ -72,7 +72,7 @@ AtomicString V8CustomXPathNSResolver::lookupNamespaceURI(const String& prefix) if (lookupNamespaceURIFunc.IsEmpty() && !m_resolver->IsFunction()) { LocalFrame* frame = callingDOMWindow(m_isolate)->frame(); if (frame && frame->host()) - frame->host()->console().addMessage(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method."); + frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method."); return nullAtom; } @@ -90,7 +90,7 @@ AtomicString V8CustomXPathNSResolver::lookupNamespaceURI(const String& prefix) if (tryCatch.HasCaught()) return nullAtom; - V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource, returnString, retval, nullAtom); + TOSTRING_DEFAULT(V8StringResource, returnString, retval, nullAtom); return returnString; }