Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / custom / V8CustomXPathNSResolver.cpp

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 (file)
--- 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<WithNullCheck>, returnString, retval, nullAtom);
+    TOSTRING_DEFAULT(V8StringResource<WithNullCheck>, returnString, retval, nullAtom);
     return returnString;
 }