| OLD | NEW |
| 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 Loading... |
| 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 3281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3477 const blink::LayoutObject* root = object1; | 3478 const blink::LayoutObject* root = object1; |
| 3478 while (root->parent()) | 3479 while (root->parent()) |
| 3479 root = root->parent(); | 3480 root = root->parent(); |
| 3480 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3481 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3481 } else { | 3482 } else { |
| 3482 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3483 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3483 } | 3484 } |
| 3484 } | 3485 } |
| 3485 | 3486 |
| 3486 #endif | 3487 #endif |
| OLD | NEW |