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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/inspector/DOMEditor.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/html/track/VTTRegion.cpp ('k') | Source/core/inspector/DOMPatchSupport.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/DOMEditor.cpp
diff --git a/Source/core/inspector/DOMEditor.cpp b/Source/core/inspector/DOMEditor.cpp
index 152d47ff97cd25039df24769d565d8a4990c17de..2573e69ee46e9947753614d64fa33a07daae367f 100644
--- a/Source/core/inspector/DOMEditor.cpp
+++ b/Source/core/inspector/DOMEditor.cpp
@@ -56,22 +56,22 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
m_anchorNode = m_node->nextSibling();
- return redo(es);
+ return redo(exceptionState);
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
- m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), es);
- return !es.hadException();
+ m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
+ return !exceptionState.hadException();
}
- virtual bool redo(ExceptionState& es)
+ virtual bool redo(ExceptionState& exceptionState)
{
- m_parentNode->removeChild(m_node.get(), es);
- return !es.hadException();
+ m_parentNode->removeChild(m_node.get(), exceptionState);
+ return !exceptionState.hadException();
}
private:
@@ -91,33 +91,33 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
if (m_node->parentNode()) {
m_removeChildAction = adoptPtr(new RemoveChildAction(m_node->parentNode(), m_node.get()));
- if (!m_removeChildAction->perform(es))
+ if (!m_removeChildAction->perform(exceptionState))
return false;
}
- m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), es);
- return !es.hadException();
+ m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
+ return !exceptionState.hadException();
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
- m_parentNode->removeChild(m_node.get(), es);
- if (es.hadException())
+ m_parentNode->removeChild(m_node.get(), exceptionState);
+ if (exceptionState.hadException())
return false;
if (m_removeChildAction)
- return m_removeChildAction->undo(es);
+ return m_removeChildAction->undo(exceptionState);
return true;
}
- virtual bool redo(ExceptionState& es)
+ virtual bool redo(ExceptionState& exceptionState)
{
- if (m_removeChildAction && !m_removeChildAction->redo(es))
+ if (m_removeChildAction && !m_removeChildAction->redo(exceptionState))
return false;
- m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), es);
- return !es.hadException();
+ m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
+ return !exceptionState.hadException();
}
private:
@@ -137,15 +137,15 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
m_value = m_element->getAttribute(m_name);
- return redo(es);
+ return redo(exceptionState);
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
- m_element->setAttribute(m_name, m_value, es);
+ m_element->setAttribute(m_name, m_value, exceptionState);
return true;
}
@@ -173,26 +173,26 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
m_hadAttribute = m_element->hasAttribute(m_name);
if (m_hadAttribute)
m_oldValue = m_element->getAttribute(m_name);
- return redo(es);
+ return redo(exceptionState);
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
if (m_hadAttribute)
- m_element->setAttribute(m_name, m_oldValue, es);
+ m_element->setAttribute(m_name, m_oldValue, exceptionState);
else
m_element->removeAttribute(m_name);
return true;
}
- virtual bool redo(ExceptionState& es)
+ virtual bool redo(ExceptionState& exceptionState)
{
- m_element->setAttribute(m_name, m_value, es);
+ m_element->setAttribute(m_name, m_value, exceptionState);
return true;
}
@@ -218,23 +218,23 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
m_oldHTML = createMarkup(m_node.get());
ASSERT(m_node->ownerDocument());
DOMPatchSupport domPatchSupport(m_domEditor.get(), *m_node->ownerDocument());
- m_newNode = domPatchSupport.patchNode(m_node.get(), m_html, es);
- return !es.hadException();
+ m_newNode = domPatchSupport.patchNode(m_node.get(), m_html, exceptionState);
+ return !exceptionState.hadException();
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
- return m_history->undo(es);
+ return m_history->undo(exceptionState);
}
- virtual bool redo(ExceptionState& es)
+ virtual bool redo(ExceptionState& exceptionState)
{
- return m_history->redo(es);
+ return m_history->redo(exceptionState);
}
Node* newNode()
@@ -262,10 +262,10 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
m_oldText = m_textNode->wholeText();
- return redo(es);
+ return redo(exceptionState);
}
virtual bool undo(ExceptionState&)
@@ -297,21 +297,21 @@ public:
{
}
- virtual bool perform(ExceptionState& es)
+ virtual bool perform(ExceptionState& exceptionState)
{
- return redo(es);
+ return redo(exceptionState);
}
- virtual bool undo(ExceptionState& es)
+ virtual bool undo(ExceptionState& exceptionState)
{
- m_parentNode->replaceChild(m_oldNode, m_newNode.get(), es);
- return !es.hadException();
+ m_parentNode->replaceChild(m_oldNode, m_newNode.get(), exceptionState);
+ return !exceptionState.hadException();
}
- virtual bool redo(ExceptionState& es)
+ virtual bool redo(ExceptionState& exceptionState)
{
- m_parentNode->replaceChild(m_newNode, m_oldNode.get(), es);
- return !es.hadException();
+ m_parentNode->replaceChild(m_newNode, m_oldNode.get(), exceptionState);
+ return !exceptionState.hadException();
}
private:
@@ -358,102 +358,102 @@ DOMEditor::DOMEditor(InspectorHistory* history) : m_history(history) { }
DOMEditor::~DOMEditor() { }
-bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ExceptionState& es)
+bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new InsertBeforeAction(parentNode, node, anchorNode)), es);
+ return m_history->perform(adoptPtr(new InsertBeforeAction(parentNode, node, anchorNode)), exceptionState);
}
-bool DOMEditor::removeChild(Node* parentNode, Node* node, ExceptionState& es)
+bool DOMEditor::removeChild(Node* parentNode, Node* node, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new RemoveChildAction(parentNode, node)), es);
+ return m_history->perform(adoptPtr(new RemoveChildAction(parentNode, node)), exceptionState);
}
-bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ExceptionState& es)
+bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new SetAttributeAction(element, name, value)), es);
+ return m_history->perform(adoptPtr(new SetAttributeAction(element, name, value)), exceptionState);
}
-bool DOMEditor::removeAttribute(Element* element, const String& name, ExceptionState& es)
+bool DOMEditor::removeAttribute(Element* element, const String& name, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new RemoveAttributeAction(element, name)), es);
+ return m_history->perform(adoptPtr(new RemoveAttributeAction(element, name)), exceptionState);
}
-bool DOMEditor::setOuterHTML(Node* node, const String& html, Node** newNode, ExceptionState& es)
+bool DOMEditor::setOuterHTML(Node* node, const String& html, Node** newNode, ExceptionState& exceptionState)
{
OwnPtr<SetOuterHTMLAction> action = adoptPtr(new SetOuterHTMLAction(node, html));
SetOuterHTMLAction* rawAction = action.get();
- bool result = m_history->perform(action.release(), es);
+ bool result = m_history->perform(action.release(), exceptionState);
if (result)
*newNode = rawAction->newNode();
return result;
}
-bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionState& es)
+bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new ReplaceWholeTextAction(textNode, text)), es);
+ return m_history->perform(adoptPtr(new ReplaceWholeTextAction(textNode, text)), exceptionState);
}
-bool DOMEditor::replaceChild(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode, ExceptionState& es)
+bool DOMEditor::replaceChild(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), es);
+ return m_history->perform(adoptPtr(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), exceptionState);
}
-bool DOMEditor::setNodeValue(Node* node, const String& value, ExceptionState& es)
+bool DOMEditor::setNodeValue(Node* node, const String& value, ExceptionState& exceptionState)
{
- return m_history->perform(adoptPtr(new SetNodeValueAction(node, value)), es);
+ return m_history->perform(adoptPtr(new SetNodeValueAction(node, value)), exceptionState);
}
-static void populateErrorString(ExceptionState& es, ErrorString* errorString)
+static void populateErrorString(ExceptionState& exceptionState, ErrorString* errorString)
{
- if (es.hadException())
- *errorString = DOMException::getErrorName(es.code());
+ if (exceptionState.hadException())
+ *errorString = DOMException::getErrorName(exceptionState.code());
}
bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = insertBefore(parentNode, node, anchorNode, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = insertBefore(parentNode, node, anchorNode, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
bool DOMEditor::removeChild(Node* parentNode, Node* node, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = removeChild(parentNode, node, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = removeChild(parentNode, node, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = setAttribute(element, name, value, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = setAttribute(element, name, value, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
bool DOMEditor::removeAttribute(Element* element, const String& name, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = removeAttribute(element, name, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = removeAttribute(element, name, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
bool DOMEditor::setOuterHTML(Node* node, const String& html, Node** newNode, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = setOuterHTML(node, html, newNode, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = setOuterHTML(node, html, newNode, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString* errorString)
{
- TrackExceptionState es;
- bool result = replaceWholeText(textNode, text, es);
- populateErrorString(es, errorString);
+ TrackExceptionState exceptionState;
+ bool result = replaceWholeText(textNode, text, exceptionState);
+ populateErrorString(exceptionState, errorString);
return result;
}
« no previous file with comments | « Source/core/html/track/VTTRegion.cpp ('k') | Source/core/inspector/DOMPatchSupport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698