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

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

Issue 2524903003: EDisplay enum class: Rename [Inline]Box to Webkit[Inline]Box. (Closed)
Patch Set: Created 4 years 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return new LayoutTableSection(element); 197 return new LayoutTableSection(element);
198 case EDisplay::TableRow: 198 case EDisplay::TableRow:
199 return new LayoutTableRow(element); 199 return new LayoutTableRow(element);
200 case EDisplay::TableColumnGroup: 200 case EDisplay::TableColumnGroup:
201 case EDisplay::TableColumn: 201 case EDisplay::TableColumn:
202 return new LayoutTableCol(element); 202 return new LayoutTableCol(element);
203 case EDisplay::TableCell: 203 case EDisplay::TableCell:
204 return new LayoutTableCell(element); 204 return new LayoutTableCell(element);
205 case EDisplay::TableCaption: 205 case EDisplay::TableCaption:
206 return new LayoutTableCaption(element); 206 return new LayoutTableCaption(element);
207 case EDisplay::Box: 207 case EDisplay::WebkitBox:
208 case EDisplay::InlineBox: 208 case EDisplay::WebkitInlineBox:
209 return new LayoutDeprecatedFlexibleBox(*element); 209 return new LayoutDeprecatedFlexibleBox(*element);
210 case EDisplay::Flex: 210 case EDisplay::Flex:
211 case EDisplay::InlineFlex: 211 case EDisplay::InlineFlex:
212 return new LayoutFlexibleBox(element); 212 return new LayoutFlexibleBox(element);
213 case EDisplay::Grid: 213 case EDisplay::Grid:
214 case EDisplay::InlineGrid: 214 case EDisplay::InlineGrid:
215 return new LayoutGrid(element); 215 return new LayoutGrid(element);
216 } 216 }
217 217
218 ASSERT_NOT_REACHED(); 218 ASSERT_NOT_REACHED();
(...skipping 3255 matching lines...) Expand 10 before | Expand all | Expand 10 after
3474 const blink::LayoutObject* root = object1; 3474 const blink::LayoutObject* root = object1;
3475 while (root->parent()) 3475 while (root->parent())
3476 root = root->parent(); 3476 root = root->parent();
3477 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3477 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3478 } else { 3478 } else {
3479 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3479 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3480 } 3480 }
3481 } 3481 }
3482 3482
3483 #endif 3483 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698