diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/core/xml/xpath_expression.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/xml/xpath_expression.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/xml/xpath_expression.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/core/xml/xpath_expression.cc b/chromium/third_party/blink/renderer/core/xml/xpath_expression.cc index 0b39fb06968..0b112519a93 100644 --- a/chromium/third_party/blink/renderer/core/xml/xpath_expression.cc +++ b/chromium/third_party/blink/renderer/core/xml/xpath_expression.cc @@ -53,7 +53,7 @@ XPathExpression* XPathExpression::CreateExpression( return expr; } -void XPathExpression::Trace(blink::Visitor* visitor) { +void XPathExpression::Trace(Visitor* visitor) { visitor->Trace(top_expression_); ScriptWrappable::Trace(visitor); } @@ -70,11 +70,13 @@ XPathResult* XPathExpression::evaluate(Node* context_node, return nullptr; } - xpath::EvaluationContext evaluation_context(*context_node); + bool had_type_conversion_error = false; + xpath::EvaluationContext evaluation_context(*context_node, + had_type_conversion_error); auto* result = MakeGarbageCollected<XPathResult>( evaluation_context, top_expression_->Evaluate(evaluation_context)); - if (evaluation_context.had_type_conversion_error) { + if (had_type_conversion_error) { // It is not specified what to do if type conversion fails while evaluating // an expression. exception_state.ThrowDOMException( |