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

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

Issue 2620623002: Implement display:flow-root (Closed)
Patch Set: bug 672508 Created 3 years, 11 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 return image; 176 return image;
177 } 177 }
178 178
179 switch (style.display()) { 179 switch (style.display()) {
180 case EDisplay::None: 180 case EDisplay::None:
181 case EDisplay::Contents: 181 case EDisplay::Contents:
182 return nullptr; 182 return nullptr;
183 case EDisplay::Inline: 183 case EDisplay::Inline:
184 return new LayoutInline(element); 184 return new LayoutInline(element);
185 case EDisplay::Block: 185 case EDisplay::Block:
186 case EDisplay::FlowRoot:
186 case EDisplay::InlineBlock: 187 case EDisplay::InlineBlock:
187 if (RuntimeEnabledFeatures::layoutNGEnabled()) 188 if (RuntimeEnabledFeatures::layoutNGEnabled())
188 return new LayoutNGBlockFlow(element); 189 return new LayoutNGBlockFlow(element);
189 return new LayoutBlockFlow(element); 190 return new LayoutBlockFlow(element);
190 case EDisplay::ListItem: 191 case EDisplay::ListItem:
191 return new LayoutListItem(element); 192 return new LayoutListItem(element);
192 case EDisplay::Table: 193 case EDisplay::Table:
193 case EDisplay::InlineTable: 194 case EDisplay::InlineTable:
194 return new LayoutTable(element); 195 return new LayoutTable(element);
195 case EDisplay::TableRowGroup: 196 case EDisplay::TableRowGroup:
(...skipping 3341 matching lines...) Expand 10 before | Expand all | Expand 10 after
3537 const blink::LayoutObject* root = object1; 3538 const blink::LayoutObject* root = object1;
3538 while (root->parent()) 3539 while (root->parent())
3539 root = root->parent(); 3540 root = root->parent();
3540 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3541 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3541 } else { 3542 } else {
3542 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3543 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3543 } 3544 }
3544 } 3545 }
3545 3546
3546 #endif 3547 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698