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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLTableElement.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, 2008, 2010, 2011 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2011 Apple Inc. All rights reserved.
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, p arseBorderWidthAttribute(value), CSSPrimitiveValue::UnitType::Pixels); 291 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidth, p arseBorderWidthAttribute(value), CSSPrimitiveValue::UnitType::Pixels);
292 } else if (name == bordercolorAttr) { 292 } else if (name == bordercolorAttr) {
293 if (!value.isEmpty()) 293 if (!value.isEmpty())
294 addHTMLColorToStyle(style, CSSPropertyBorderColor, value); 294 addHTMLColorToStyle(style, CSSPropertyBorderColor, value);
295 } else if (name == bgcolorAttr) { 295 } else if (name == bgcolorAttr) {
296 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); 296 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value);
297 } else if (name == backgroundAttr) { 297 } else if (name == backgroundAttr) {
298 String url = stripLeadingAndTrailingHTMLSpaces(value); 298 String url = stripLeadingAndTrailingHTMLSpaces(value);
299 if (!url.isEmpty()) { 299 if (!url.isEmpty()) {
300 RefPtrWillBeRawPtr<CSSImageValue> imageValue = CSSImageValue::create (url, document().completeURL(url)); 300 RefPtrWillBeRawPtr<CSSImageValue> imageValue = CSSImageValue::create (url, document().completeURL(url));
301 imageValue->setReferrer(Referrer(document().outgoingReferrer(), docu ment().referrerPolicy())); 301 imageValue->setReferrer(Referrer(document().outgoingReferrer(), docu ment().getReferrerPolicy()));
302 style->setProperty(CSSProperty(CSSPropertyBackgroundImage, imageValu e.release())); 302 style->setProperty(CSSProperty(CSSPropertyBackgroundImage, imageValu e.release()));
303 } 303 }
304 } else if (name == valignAttr) { 304 } else if (name == valignAttr) {
305 if (!value.isEmpty()) 305 if (!value.isEmpty())
306 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, value); 306 addPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAl ign, value);
307 } else if (name == cellspacingAttr) { 307 } else if (name == cellspacingAttr) {
308 if (!value.isEmpty()) 308 if (!value.isEmpty())
309 addHTMLLengthToStyle(style, CSSPropertyBorderSpacing, value); 309 addHTMLLengthToStyle(style, CSSPropertyBorderSpacing, value);
310 } else if (name == alignAttr) { 310 } else if (name == alignAttr) {
311 if (!value.isEmpty()) { 311 if (!value.isEmpty()) {
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 return getAttribute(summaryAttr); 558 return getAttribute(summaryAttr);
559 } 559 }
560 560
561 DEFINE_TRACE(HTMLTableElement) 561 DEFINE_TRACE(HTMLTableElement)
562 { 562 {
563 visitor->trace(m_sharedCellStyle); 563 visitor->trace(m_sharedCellStyle);
564 HTMLElement::trace(visitor); 564 HTMLElement::trace(visitor);
565 } 565 }
566 566
567 } // namespace blink 567 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698