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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 image->setIsGeneratedContent(); | 181 image->setIsGeneratedContent(); |
182 } else { | 182 } else { |
183 image->setImageResource(LayoutImageResource::create()); | 183 image->setImageResource(LayoutImageResource::create()); |
184 } | 184 } |
185 image->setStyleInternal(nullptr); | 185 image->setStyleInternal(nullptr); |
186 return image; | 186 return image; |
187 } | 187 } |
188 | 188 |
189 switch (style.display()) { | 189 switch (style.display()) { |
190 case EDisplay::None: | 190 case EDisplay::None: |
| 191 case EDisplay::Contents: |
191 return nullptr; | 192 return nullptr; |
192 case EDisplay::Inline: | 193 case EDisplay::Inline: |
193 return new LayoutInline(element); | 194 return new LayoutInline(element); |
194 case EDisplay::Block: | 195 case EDisplay::Block: |
195 case EDisplay::InlineBlock: | 196 case EDisplay::InlineBlock: |
196 if (RuntimeEnabledFeatures::layoutNGEnabled()) | 197 if (RuntimeEnabledFeatures::layoutNGEnabled()) |
197 return new LayoutNGBlockFlow(element); | 198 return new LayoutNGBlockFlow(element); |
198 return new LayoutBlockFlow(element); | 199 return new LayoutBlockFlow(element); |
199 case EDisplay::ListItem: | 200 case EDisplay::ListItem: |
200 return new LayoutListItem(element); | 201 return new LayoutListItem(element); |
(...skipping 3338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3539 const blink::LayoutObject* root = object1; | 3540 const blink::LayoutObject* root = object1; |
3540 while (root->parent()) | 3541 while (root->parent()) |
3541 root = root->parent(); | 3542 root = root->parent(); |
3542 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3543 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
3543 } else { | 3544 } else { |
3544 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3545 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
3545 } | 3546 } |
3546 } | 3547 } |
3547 | 3548 |
3548 #endif | 3549 #endif |
OLD | NEW |