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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLTablePartElement.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) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. 7 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } 47 }
48 48
49 void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedN ame& name, const AtomicString& value, MutableStylePropertySet* style) 49 void HTMLTablePartElement::collectStyleForPresentationAttribute(const QualifiedN ame& name, const AtomicString& value, MutableStylePropertySet* style)
50 { 50 {
51 if (name == bgcolorAttr) { 51 if (name == bgcolorAttr) {
52 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); 52 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value);
53 } else if (name == backgroundAttr) { 53 } else if (name == backgroundAttr) {
54 String url = stripLeadingAndTrailingHTMLSpaces(value); 54 String url = stripLeadingAndTrailingHTMLSpaces(value);
55 if (!url.isEmpty()) { 55 if (!url.isEmpty()) {
56 RefPtrWillBeRawPtr<CSSImageValue> imageValue = CSSImageValue::create (url, document().completeURL(url)); 56 RefPtrWillBeRawPtr<CSSImageValue> imageValue = CSSImageValue::create (url, document().completeURL(url));
57 imageValue->setReferrer(Referrer(document().outgoingReferrer(), docu ment().referrerPolicy())); 57 imageValue->setReferrer(Referrer(document().outgoingReferrer(), docu ment().getReferrerPolicy()));
58 style->setProperty(CSSProperty(CSSPropertyBackgroundImage, imageValu e.release())); 58 style->setProperty(CSSProperty(CSSPropertyBackgroundImage, imageValu e.release()));
59 } 59 }
60 } else if (name == valignAttr) { 60 } else if (name == valignAttr) {
61 if (equalIgnoringCase(value, "top")) 61 if (equalIgnoringCase(value, "top"))
62 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueTop); 62 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueTop);
63 else if (equalIgnoringCase(value, "middle")) 63 else if (equalIgnoringCase(value, "middle"))
64 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueMiddle); 64 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueMiddle);
65 else if (equalIgnoringCase(value, "bottom")) 65 else if (equalIgnoringCase(value, "bottom"))
66 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueBottom); 66 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, CSSValueBottom);
67 else if (equalIgnoringCase(value, "baseline")) 67 else if (equalIgnoringCase(value, "baseline"))
(...skipping 21 matching lines...) Expand all
89 89
90 HTMLTableElement* HTMLTablePartElement::findParentTable() const 90 HTMLTableElement* HTMLTablePartElement::findParentTable() const
91 { 91 {
92 ContainerNode* parent = FlatTreeTraversal::parent(*this); 92 ContainerNode* parent = FlatTreeTraversal::parent(*this);
93 while (parent && !isHTMLTableElement(*parent)) 93 while (parent && !isHTMLTableElement(*parent))
94 parent = FlatTreeTraversal::parent(*parent); 94 parent = FlatTreeTraversal::parent(*parent);
95 return toHTMLTableElement(parent); 95 return toHTMLTableElement(parent);
96 } 96 }
97 97
98 } // namespace blink 98 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698