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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTreeAsText.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, 9 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, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 break; 99 break;
100 } 100 }
101 101
102 ts << " "; 102 ts << " ";
103 } 103 }
104 104
105 static String getTagName(Node* n) 105 static String getTagName(Node* n)
106 { 106 {
107 if (n->isDocumentNode()) 107 if (n->isDocumentNode())
108 return ""; 108 return "";
109 if (n->nodeType() == Node::COMMENT_NODE) 109 if (n->getNodeType() == Node::COMMENT_NODE)
110 return "COMMENT"; 110 return "COMMENT";
111 return n->nodeName(); 111 return n->nodeName();
112 } 112 }
113 113
114 static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) 114 static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node)
115 { 115 {
116 if (!isHTMLSpanElement(node)) 116 if (!isHTMLSpanElement(node))
117 return false; 117 return false;
118 118
119 const HTMLElement& elem = toHTMLElement(*node); 119 const HTMLElement& elem = toHTMLElement(*node);
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 element->document().updateLayout(); 845 element->document().updateLayout();
846 846
847 LayoutObject* layoutObject = element->layoutObject(); 847 LayoutObject* layoutObject = element->layoutObject();
848 if (!layoutObject || !layoutObject->isListItem()) 848 if (!layoutObject || !layoutObject->isListItem())
849 return String(); 849 return String();
850 850
851 return toLayoutListItem(layoutObject)->markerText(); 851 return toLayoutListItem(layoutObject)->markerText();
852 } 852 }
853 853
854 } // namespace blink 854 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698