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

Side by Side Diff: Source/core/html/HTMLTableCellElement.cpp

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mike's comments Created 6 years, 1 month 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
« no previous file with comments | « Source/core/html/HTMLSummaryElement.cpp ('k') | Source/core/html/HTMLTableColElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2010 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (renderer() && renderer()->isTableCell()) 114 if (renderer() && renderer()->isTableCell())
115 toRenderTableCell(renderer())->colSpanOrRowSpanChanged(); 115 toRenderTableCell(renderer())->colSpanOrRowSpanChanged();
116 } else 116 } else
117 HTMLTablePartElement::parseAttribute(name, value); 117 HTMLTablePartElement::parseAttribute(name, value);
118 } 118 }
119 119
120 const StylePropertySet* HTMLTableCellElement::additionalPresentationAttributeSty le() 120 const StylePropertySet* HTMLTableCellElement::additionalPresentationAttributeSty le()
121 { 121 {
122 if (HTMLTableElement* table = findParentTable()) 122 if (HTMLTableElement* table = findParentTable())
123 return table->additionalCellStyle(); 123 return table->additionalCellStyle();
124 return 0; 124 return nullptr;
125 } 125 }
126 126
127 bool HTMLTableCellElement::isURLAttribute(const Attribute& attribute) const 127 bool HTMLTableCellElement::isURLAttribute(const Attribute& attribute) const
128 { 128 {
129 return attribute.name() == backgroundAttr || HTMLTablePartElement::isURLAttr ibute(attribute); 129 return attribute.name() == backgroundAttr || HTMLTablePartElement::isURLAttr ibute(attribute);
130 } 130 }
131 131
132 bool HTMLTableCellElement::hasLegalLinkAttribute(const QualifiedName& name) cons t 132 bool HTMLTableCellElement::hasLegalLinkAttribute(const QualifiedName& name) cons t
133 { 133 {
134 return (hasTagName(tdTag) && name == backgroundAttr) || HTMLTablePartElement ::hasLegalLinkAttribute(name); 134 return (hasTagName(tdTag) && name == backgroundAttr) || HTMLTablePartElement ::hasLegalLinkAttribute(name);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 const AtomicString& HTMLTableCellElement::scope() const 167 const AtomicString& HTMLTableCellElement::scope() const
168 { 168 {
169 return fastGetAttribute(scopeAttr); 169 return fastGetAttribute(scopeAttr);
170 } 170 }
171 171
172 HTMLTableCellElement* HTMLTableCellElement::cellAbove() const 172 HTMLTableCellElement* HTMLTableCellElement::cellAbove() const
173 { 173 {
174 RenderObject* cellRenderer = renderer(); 174 RenderObject* cellRenderer = renderer();
175 if (!cellRenderer) 175 if (!cellRenderer)
176 return 0; 176 return nullptr;
177 if (!cellRenderer->isTableCell()) 177 if (!cellRenderer->isTableCell())
178 return 0; 178 return nullptr;
179 179
180 RenderTableCell* tableCellRenderer = toRenderTableCell(cellRenderer); 180 RenderTableCell* tableCellRenderer = toRenderTableCell(cellRenderer);
181 RenderTableCell* cellAboveRenderer = tableCellRenderer->table()->cellAbove(t ableCellRenderer); 181 RenderTableCell* cellAboveRenderer = tableCellRenderer->table()->cellAbove(t ableCellRenderer);
182 if (!cellAboveRenderer) 182 if (!cellAboveRenderer)
183 return 0; 183 return nullptr;
184 184
185 return toHTMLTableCellElement(cellAboveRenderer->node()); 185 return toHTMLTableCellElement(cellAboveRenderer->node());
186 } 186 }
187 187
188 } // namespace blink 188 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLSummaryElement.cpp ('k') | Source/core/html/HTMLTableColElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698