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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/inspector/DOMEditor.cpp

Issue 638553002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/inspector/DOMEditor.h ('k') | Source/core/inspector/DOMPatchSupport.h » ('j') | Source/core/inspector/InspectorCSSAgent.h » ('J')
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 c9a8feae3a06b170953a16142a0a4a172cb819ed..fb04a4e41c849635b190d1d109c0acf55a314c6c 100644
--- a/Source/core/inspector/DOMEditor.cpp
+++ b/Source/core/inspector/DOMEditor.cpp
@@ -44,7 +44,7 @@
namespace blink {
-class DOMEditor::RemoveChildAction FINAL : public InspectorHistory::Action {
+class DOMEditor::RemoveChildAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(RemoveChildAction);
public:
RemoveChildAction(Node* parentNode, Node* node)
@@ -54,25 +54,25 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
m_anchorNode = m_node->nextSibling();
return redo(exceptionState);
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
return !exceptionState.hadException();
}
- virtual bool redo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool redo(ExceptionState& exceptionState) override
{
m_parentNode->removeChild(m_node.get(), exceptionState);
return !exceptionState.hadException();
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_parentNode);
visitor->trace(m_node);
@@ -86,7 +86,7 @@ private:
RefPtrWillBeMember<Node> m_anchorNode;
};
-class DOMEditor::InsertBeforeAction FINAL : public InspectorHistory::Action {
+class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(InsertBeforeAction);
public:
InsertBeforeAction(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode)
@@ -97,7 +97,7 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
if (m_node->parentNode()) {
m_removeChildAction = adoptRefWillBeNoop(new RemoveChildAction(m_node->parentNode(), m_node.get()));
@@ -108,7 +108,7 @@ public:
return !exceptionState.hadException();
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
m_parentNode->removeChild(m_node.get(), exceptionState);
if (exceptionState.hadException())
@@ -118,7 +118,7 @@ public:
return true;
}
- virtual bool redo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool redo(ExceptionState& exceptionState) override
{
if (m_removeChildAction && !m_removeChildAction->redo(exceptionState))
return false;
@@ -126,7 +126,7 @@ public:
return !exceptionState.hadException();
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_parentNode);
visitor->trace(m_node);
@@ -142,7 +142,7 @@ private:
RefPtrWillBeMember<RemoveChildAction> m_removeChildAction;
};
-class DOMEditor::RemoveAttributeAction FINAL : public InspectorHistory::Action {
+class DOMEditor::RemoveAttributeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(RemoveAttributeAction);
public:
RemoveAttributeAction(Element* element, const AtomicString& name)
@@ -152,25 +152,25 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
m_value = m_element->getAttribute(m_name);
return redo(exceptionState);
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
m_element->setAttribute(m_name, m_value, exceptionState);
return true;
}
- virtual bool redo(ExceptionState&) OVERRIDE
+ virtual bool redo(ExceptionState&) override
{
m_element->removeAttribute(m_name);
return true;
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_element);
InspectorHistory::Action::trace(visitor);
@@ -182,7 +182,7 @@ private:
AtomicString m_value;
};
-class DOMEditor::SetAttributeAction FINAL : public InspectorHistory::Action {
+class DOMEditor::SetAttributeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(SetAttributeAction);
public:
SetAttributeAction(Element* element, const AtomicString& name, const AtomicString& value)
@@ -194,7 +194,7 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
const AtomicString& value = m_element->getAttribute(m_name);
m_hadAttribute = !value.isNull();
@@ -203,7 +203,7 @@ public:
return redo(exceptionState);
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
if (m_hadAttribute)
m_element->setAttribute(m_name, m_oldValue, exceptionState);
@@ -212,13 +212,13 @@ public:
return true;
}
- virtual bool redo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool redo(ExceptionState& exceptionState) override
{
m_element->setAttribute(m_name, m_value, exceptionState);
return true;
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_element);
InspectorHistory::Action::trace(visitor);
@@ -232,7 +232,7 @@ private:
AtomicString m_oldValue;
};
-class DOMEditor::SetOuterHTMLAction FINAL : public InspectorHistory::Action {
+class DOMEditor::SetOuterHTMLAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(SetOuterHTMLAction);
public:
SetOuterHTMLAction(Node* node, const String& html)
@@ -246,7 +246,7 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
m_oldHTML = createMarkup(m_node.get());
ASSERT(m_node->ownerDocument());
@@ -255,12 +255,12 @@ public:
return !exceptionState.hadException();
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
return m_history->undo(exceptionState);
}
- virtual bool redo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool redo(ExceptionState& exceptionState) override
{
return m_history->redo(exceptionState);
}
@@ -270,7 +270,7 @@ public:
return m_newNode;
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_node);
visitor->trace(m_nextSibling);
@@ -290,7 +290,7 @@ private:
OwnPtrWillBeMember<DOMEditor> m_domEditor;
};
-class DOMEditor::ReplaceWholeTextAction FINAL : public InspectorHistory::Action {
+class DOMEditor::ReplaceWholeTextAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(ReplaceWholeTextAction);
public:
ReplaceWholeTextAction(Text* textNode, const String& text)
@@ -300,25 +300,25 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
m_oldText = m_textNode->wholeText();
return redo(exceptionState);
}
- virtual bool undo(ExceptionState&) OVERRIDE
+ virtual bool undo(ExceptionState&) override
{
m_textNode->replaceWholeText(m_oldText);
return true;
}
- virtual bool redo(ExceptionState&) OVERRIDE
+ virtual bool redo(ExceptionState&) override
{
m_textNode->replaceWholeText(m_text);
return true;
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_textNode);
InspectorHistory::Action::trace(visitor);
@@ -330,7 +330,7 @@ private:
String m_oldText;
};
-class DOMEditor::ReplaceChildNodeAction FINAL : public InspectorHistory::Action {
+class DOMEditor::ReplaceChildNodeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(ReplaceChildNodeAction);
public:
ReplaceChildNodeAction(Node* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode)
@@ -341,24 +341,24 @@ public:
{
}
- virtual bool perform(ExceptionState& exceptionState) OVERRIDE
+ virtual bool perform(ExceptionState& exceptionState) override
{
return redo(exceptionState);
}
- virtual bool undo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool undo(ExceptionState& exceptionState) override
{
m_parentNode->replaceChild(m_oldNode, m_newNode.get(), exceptionState);
return !exceptionState.hadException();
}
- virtual bool redo(ExceptionState& exceptionState) OVERRIDE
+ virtual bool redo(ExceptionState& exceptionState) override
{
m_parentNode->replaceChild(m_newNode, m_oldNode.get(), exceptionState);
return !exceptionState.hadException();
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_parentNode);
visitor->trace(m_newNode);
@@ -372,7 +372,7 @@ private:
RefPtrWillBeMember<Node> m_oldNode;
};
-class DOMEditor::SetNodeValueAction FINAL : public InspectorHistory::Action {
+class DOMEditor::SetNodeValueAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(SetNodeValueAction);
public:
SetNodeValueAction(Node* node, const String& value)
@@ -382,25 +382,25 @@ public:
{
}
- virtual bool perform(ExceptionState&) OVERRIDE
+ virtual bool perform(ExceptionState&) override
{
m_oldValue = m_node->nodeValue();
return redo(IGNORE_EXCEPTION);
}
- virtual bool undo(ExceptionState&) OVERRIDE
+ virtual bool undo(ExceptionState&) override
{
m_node->setNodeValue(m_oldValue);
return true;
}
- virtual bool redo(ExceptionState&) OVERRIDE
+ virtual bool redo(ExceptionState&) override
{
m_node->setNodeValue(m_value);
return true;
}
- virtual void trace(Visitor* visitor) OVERRIDE
+ virtual void trace(Visitor* visitor) override
{
visitor->trace(m_node);
InspectorHistory::Action::trace(visitor);
« no previous file with comments | « Source/core/inspector/DOMEditor.h ('k') | Source/core/inspector/DOMPatchSupport.h » ('j') | Source/core/inspector/InspectorCSSAgent.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698