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

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

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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/XPathParser.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathResult.cpp
diff --git a/Source/core/xml/XPathResult.cpp b/Source/core/xml/XPathResult.cpp
index 99973d96ad996fcabe5489ddd0e2c49658c2c490..916074505301e74b9e9a4985143c3fd90784b4fc 100644
--- a/Source/core/xml/XPathResult.cpp
+++ b/Source/core/xml/XPathResult.cpp
@@ -67,7 +67,7 @@ XPathResult::~XPathResult()
{
}
-void XPathResult::convertTo(unsigned short type, ExceptionState& es)
+void XPathResult::convertTo(unsigned short type, ExceptionState& exceptionState)
{
switch (type) {
case ANY_TYPE:
@@ -89,14 +89,14 @@ void XPathResult::convertTo(unsigned short type, ExceptionState& es)
case ANY_UNORDERED_NODE_TYPE:
case FIRST_ORDERED_NODE_TYPE: // This is correct - singleNodeValue() will take care of ordering.
if (!m_value.isNodeSet()) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return;
}
m_resultType = type;
break;
case ORDERED_NODE_ITERATOR_TYPE:
if (!m_value.isNodeSet()) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return;
}
m_nodeSet.sort();
@@ -104,7 +104,7 @@ void XPathResult::convertTo(unsigned short type, ExceptionState& es)
break;
case ORDERED_NODE_SNAPSHOT_TYPE:
if (!m_value.isNodeSet()) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return;
}
m_value.toNodeSet().sort();
@@ -118,37 +118,37 @@ unsigned short XPathResult::resultType() const
return m_resultType;
}
-double XPathResult::numberValue(ExceptionState& es) const
+double XPathResult::numberValue(ExceptionState& exceptionState) const
{
if (resultType() != NUMBER_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return 0.0;
}
return m_value.toNumber();
}
-String XPathResult::stringValue(ExceptionState& es) const
+String XPathResult::stringValue(ExceptionState& exceptionState) const
{
if (resultType() != STRING_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return String();
}
return m_value.toString();
}
-bool XPathResult::booleanValue(ExceptionState& es) const
+bool XPathResult::booleanValue(ExceptionState& exceptionState) const
{
if (resultType() != BOOLEAN_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return false;
}
return m_value.toBoolean();
}
-Node* XPathResult::singleNodeValue(ExceptionState& es) const
+Node* XPathResult::singleNodeValue(ExceptionState& exceptionState) const
{
if (resultType() != ANY_UNORDERED_NODE_TYPE && resultType() != FIRST_ORDERED_NODE_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return 0;
}
@@ -168,25 +168,25 @@ bool XPathResult::invalidIteratorState() const
return m_document->domTreeVersion() != m_domTreeVersion;
}
-unsigned long XPathResult::snapshotLength(ExceptionState& es) const
+unsigned long XPathResult::snapshotLength(ExceptionState& exceptionState) const
{
if (resultType() != UNORDERED_NODE_SNAPSHOT_TYPE && resultType() != ORDERED_NODE_SNAPSHOT_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return 0;
}
return m_value.toNodeSet().size();
}
-Node* XPathResult::iterateNext(ExceptionState& es)
+Node* XPathResult::iterateNext(ExceptionState& exceptionState)
{
if (resultType() != UNORDERED_NODE_ITERATOR_TYPE && resultType() != ORDERED_NODE_ITERATOR_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return 0;
}
if (invalidIteratorState()) {
- es.throwUninformativeAndGenericDOMException(InvalidStateError);
+ exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
return 0;
}
@@ -200,10 +200,10 @@ Node* XPathResult::iterateNext(ExceptionState& es)
return node;
}
-Node* XPathResult::snapshotItem(unsigned long index, ExceptionState& es)
+Node* XPathResult::snapshotItem(unsigned long index, ExceptionState& exceptionState)
{
if (resultType() != UNORDERED_NODE_SNAPSHOT_TYPE && resultType() != ORDERED_NODE_SNAPSHOT_TYPE) {
- es.throwUninformativeAndGenericTypeError();
+ exceptionState.throwUninformativeAndGenericTypeError();
return 0;
}
« no previous file with comments | « Source/core/xml/XPathParser.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698