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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 const_cast<StyleImage*>(styleImage))); 167 const_cast<StyleImage*>(styleImage)));
168 image->setIsGeneratedContent(); 168 image->setIsGeneratedContent();
169 } else { 169 } else {
170 image->setImageResource(LayoutImageResource::create()); 170 image->setImageResource(LayoutImageResource::create());
171 } 171 }
172 image->setStyleInternal(nullptr); 172 image->setStyleInternal(nullptr);
173 return image; 173 return image;
174 } 174 }
175 175
176 switch (style.display()) { 176 switch (style.display()) {
177 case EDisplay::None: 177 case EDisplay::kNone:
178 case EDisplay::Contents: 178 case EDisplay::kContents:
179 return nullptr; 179 return nullptr;
180 case EDisplay::Inline: 180 case EDisplay::kInline:
181 return new LayoutInline(element); 181 return new LayoutInline(element);
182 case EDisplay::Block: 182 case EDisplay::kBlock:
183 case EDisplay::FlowRoot: 183 case EDisplay::kFlowRoot:
184 case EDisplay::InlineBlock: 184 case EDisplay::kInlineBlock:
185 if (RuntimeEnabledFeatures::layoutNGEnabled()) 185 if (RuntimeEnabledFeatures::layoutNGEnabled())
186 return new LayoutNGBlockFlow(element); 186 return new LayoutNGBlockFlow(element);
187 return new LayoutBlockFlow(element); 187 return new LayoutBlockFlow(element);
188 case EDisplay::ListItem: 188 case EDisplay::kListItem:
189 return new LayoutListItem(element); 189 return new LayoutListItem(element);
190 case EDisplay::Table: 190 case EDisplay::kTable:
191 case EDisplay::InlineTable: 191 case EDisplay::kInlineTable:
192 return new LayoutTable(element); 192 return new LayoutTable(element);
193 case EDisplay::TableRowGroup: 193 case EDisplay::kTableRowGroup:
194 case EDisplay::TableHeaderGroup: 194 case EDisplay::kTableHeaderGroup:
195 case EDisplay::TableFooterGroup: 195 case EDisplay::kTableFooterGroup:
196 return new LayoutTableSection(element); 196 return new LayoutTableSection(element);
197 case EDisplay::TableRow: 197 case EDisplay::kTableRow:
198 return new LayoutTableRow(element); 198 return new LayoutTableRow(element);
199 case EDisplay::TableColumnGroup: 199 case EDisplay::kTableColumnGroup:
200 case EDisplay::TableColumn: 200 case EDisplay::kTableColumn:
201 return new LayoutTableCol(element); 201 return new LayoutTableCol(element);
202 case EDisplay::TableCell: 202 case EDisplay::kTableCell:
203 return new LayoutTableCell(element); 203 return new LayoutTableCell(element);
204 case EDisplay::TableCaption: 204 case EDisplay::kTableCaption:
205 return new LayoutTableCaption(element); 205 return new LayoutTableCaption(element);
206 case EDisplay::WebkitBox: 206 case EDisplay::kWebkitBox:
207 case EDisplay::WebkitInlineBox: 207 case EDisplay::kWebkitInlineBox:
208 return new LayoutDeprecatedFlexibleBox(*element); 208 return new LayoutDeprecatedFlexibleBox(*element);
209 case EDisplay::Flex: 209 case EDisplay::kFlex:
210 case EDisplay::InlineFlex: 210 case EDisplay::kInlineFlex:
211 return new LayoutFlexibleBox(element); 211 return new LayoutFlexibleBox(element);
212 case EDisplay::Grid: 212 case EDisplay::kGrid:
213 case EDisplay::InlineGrid: 213 case EDisplay::kInlineGrid:
214 return new LayoutGrid(element); 214 return new LayoutGrid(element);
215 } 215 }
216 216
217 ASSERT_NOT_REACHED(); 217 ASSERT_NOT_REACHED();
218 return nullptr; 218 return nullptr;
219 } 219 }
220 220
221 LayoutObject::LayoutObject(Node* node) 221 LayoutObject::LayoutObject(Node* node)
222 : m_style(nullptr), 222 : m_style(nullptr),
223 m_node(node), 223 m_node(node),
(...skipping 3373 matching lines...) Expand 10 before | Expand all | Expand 10 after
3597 const blink::LayoutObject* root = object1; 3597 const blink::LayoutObject* root = object1;
3598 while (root->parent()) 3598 while (root->parent())
3599 root = root->parent(); 3599 root = root->parent();
3600 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3600 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3601 } else { 3601 } else {
3602 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3602 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3603 } 3603 }
3604 } 3604 }
3605 3605
3606 #endif 3606 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutPagedFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698