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

Side by Side Diff: Source/core/editing/markup.cpp

Issue 134343002: Update editing classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.
4 * Copyright (C) 2011 Igalia S.L. 4 * Copyright (C) 2011 Igalia S.L.
5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void wrapWithStyleNode(StylePropertySet*, Document*, bool isBlock = false); 123 void wrapWithStyleNode(StylePropertySet*, Document*, bool isBlock = false);
124 String takeResults(); 124 String takeResults();
125 125
126 private: 126 private:
127 void appendStyleNodeOpenTag(StringBuilder&, StylePropertySet*, Document*, bo ol isBlock = false); 127 void appendStyleNodeOpenTag(StringBuilder&, StylePropertySet*, Document*, bo ol isBlock = false);
128 const String& styleNodeCloseTag(bool isBlock = false); 128 const String& styleNodeCloseTag(bool isBlock = false);
129 virtual void appendText(StringBuilder& out, Text*) OVERRIDE; 129 virtual void appendText(StringBuilder& out, Text*) OVERRIDE;
130 String renderedText(const Node*, const Range*); 130 String renderedText(const Node*, const Range*);
131 String stringValueForRange(const Node*, const Range*); 131 String stringValueForRange(const Node*, const Range*);
132 void appendElement(StringBuilder& out, Element*, bool addDisplayInline, Rang eFullySelectsNode); 132 void appendElement(StringBuilder& out, Element*, bool addDisplayInline, Rang eFullySelectsNode);
133 void appendElement(StringBuilder& out, Element* element, Namespaces*) OVERRI DE { appendElement(out, element, false, DoesFullySelectNode); } 133 virtual void appendElement(StringBuilder& out, Element* element, Namespaces* ) OVERRIDE { appendElement(out, element, false, DoesFullySelectNode); }
134 134
135 enum NodeTraversalMode { EmitString, DoNotEmitString }; 135 enum NodeTraversalMode { EmitString, DoNotEmitString };
136 Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTrav ersalMode); 136 Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTrav ersalMode);
137 137
138 bool shouldAnnotate() { return m_shouldAnnotate == AnnotateForInterchange; } 138 bool shouldAnnotate() { return m_shouldAnnotate == AnnotateForInterchange; }
139 bool shouldApplyWrappingStyle(Node* node) const 139 bool shouldApplyWrappingStyle(Node* node) const
140 { 140 {
141 return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->paren tNode() == node->parentNode() 141 return m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->paren tNode() == node->parentNode()
142 && m_wrappingStyle && m_wrappingStyle->style(); 142 && m_wrappingStyle && m_wrappingStyle->style();
143 } 143 }
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 return; 1077 return;
1078 1078
1079 RefPtr<Text> textNode = toText(node.get()); 1079 RefPtr<Text> textNode = toText(node.get());
1080 RefPtr<Text> textNext = toText(next); 1080 RefPtr<Text> textNext = toText(next);
1081 textNode->appendData(textNext->data()); 1081 textNode->appendData(textNext->data());
1082 if (textNext->parentNode()) // Might have been removed by mutation event. 1082 if (textNext->parentNode()) // Might have been removed by mutation event.
1083 textNext->remove(exceptionState); 1083 textNext->remove(exceptionState);
1084 } 1084 }
1085 1085
1086 } 1086 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698