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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 image->setIsGeneratedContent(); | 171 image->setIsGeneratedContent(); |
172 } else { | 172 } else { |
173 image->setImageResource(LayoutImageResource::create()); | 173 image->setImageResource(LayoutImageResource::create()); |
174 } | 174 } |
175 image->setStyleInternal(nullptr); | 175 image->setStyleInternal(nullptr); |
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 return nullptr; |
181 case EDisplay::Contents: | 182 case EDisplay::Contents: |
| 183 DCHECK(!element->isSVGElement()); |
182 return nullptr; | 184 return nullptr; |
183 case EDisplay::Inline: | 185 case EDisplay::Inline: |
184 return new LayoutInline(element); | 186 return new LayoutInline(element); |
185 case EDisplay::Block: | 187 case EDisplay::Block: |
186 case EDisplay::FlowRoot: | 188 case EDisplay::FlowRoot: |
187 case EDisplay::InlineBlock: | 189 case EDisplay::InlineBlock: |
188 if (RuntimeEnabledFeatures::layoutNGEnabled()) | 190 if (RuntimeEnabledFeatures::layoutNGEnabled()) |
189 return new LayoutNGBlockFlow(element); | 191 return new LayoutNGBlockFlow(element); |
190 return new LayoutBlockFlow(element); | 192 return new LayoutBlockFlow(element); |
191 case EDisplay::ListItem: | 193 case EDisplay::ListItem: |
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3499 const blink::LayoutObject* root = object1; | 3501 const blink::LayoutObject* root = object1; |
3500 while (root->parent()) | 3502 while (root->parent()) |
3501 root = root->parent(); | 3503 root = root->parent(); |
3502 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3504 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
3503 } else { | 3505 } else { |
3504 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3506 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
3505 } | 3507 } |
3506 } | 3508 } |
3507 | 3509 |
3508 #endif | 3510 #endif |
OLD | NEW |