Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: Source/core/xml/XPathEvaluator.cpp

Issue 983123003: Add [TypeChecking=Interface] to XPath interfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: revert test change; no longer needed Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/xml/XPathEvaluator.h ('k') | Source/core/xml/XPathEvaluator.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathEvaluator.cpp
diff --git a/Source/core/xml/XPathEvaluator.cpp b/Source/core/xml/XPathEvaluator.cpp
index 64708c1fce91617d5e7bfd5f4811fad18cb1a621..21a49b85833f9fd820638fd87c9d077191163902 100644
--- a/Source/core/xml/XPathEvaluator.cpp
+++ b/Source/core/xml/XPathEvaluator.cpp
@@ -50,13 +50,8 @@ PassRefPtrWillBeRawPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* n
}
PassRefPtrWillBeRawPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode,
- PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, unsigned short type, XPathResult* result, ExceptionState& exceptionState)
+ PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, unsigned short type, const ScriptValue&, ExceptionState& exceptionState)
{
- if (!contextNode) {
- exceptionState.throwDOMException(NotSupportedError, "The context node provided is null.");
- return nullptr;
- }
-
if (!isValidContextNode(contextNode)) {
exceptionState.throwDOMException(NotSupportedError, "The node provided is '" + contextNode->nodeName() + "', which is not a valid context node type.");
return nullptr;
@@ -66,7 +61,7 @@ PassRefPtrWillBeRawPtr<XPathResult> XPathEvaluator::evaluate(const String& expre
if (exceptionState.hadException())
return nullptr;
- return expr->evaluate(contextNode, type, result, exceptionState);
+ return expr->evaluate(contextNode, type, ScriptValue(), exceptionState);
}
}
« no previous file with comments | « Source/core/xml/XPathEvaluator.h ('k') | Source/core/xml/XPathEvaluator.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698