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

Unified Diff: third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 years, 10 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
Index: third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
diff --git a/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp b/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
index 2d87cd5784e4a66a840126a9904ff9764e4b7a47..4f4869917e785f7345b73ff31324900d6d8a4ecf 100644
--- a/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
+++ b/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
@@ -1036,13 +1036,13 @@ void XMLDocumentParser::startElementNs(const AtomicString& localName, const Atom
TrackExceptionState exceptionState;
handleNamespaceAttributes(prefixedAttributes, libxmlNamespaces, nbNamespaces, exceptionState);
if (exceptionState.hadException()) {
- setAttributes(newElement.get(), prefixedAttributes, parserContentPolicy());
+ setAttributes(newElement.get(), prefixedAttributes, getParserContentPolicy());
stopParsing();
return;
}
handleElementAttributes(prefixedAttributes, libxmlAttributes, nbAttributes, m_prefixToNamespaceMap, exceptionState);
- setAttributes(newElement.get(), prefixedAttributes, parserContentPolicy());
+ setAttributes(newElement.get(), prefixedAttributes, getParserContentPolicy());
if (exceptionState.hadException()) {
stopParsing();
return;
@@ -1096,7 +1096,7 @@ void XMLDocumentParser::endElementNs()
if (m_currentNode->isElementNode())
toElement(n.get())->finishParsingChildren();
- if (!scriptingContentIsAllowed(parserContentPolicy()) && n->isElementNode() && toScriptLoaderIfPossible(toElement(n))) {
+ if (!scriptingContentIsAllowed(getParserContentPolicy()) && n->isElementNode() && toScriptLoaderIfPossible(toElement(n))) {
popCurrentNode();
n->remove(IGNORE_EXCEPTION);
return;

Powered by Google App Engine
This is Rietveld 408576698