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. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "core/layout/LayoutListItem.h" | 59 #include "core/layout/LayoutListItem.h" |
60 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" | 60 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" |
61 #include "core/layout/LayoutPart.h" | 61 #include "core/layout/LayoutPart.h" |
62 #include "core/layout/LayoutScrollbarPart.h" | 62 #include "core/layout/LayoutScrollbarPart.h" |
63 #include "core/layout/LayoutTableCaption.h" | 63 #include "core/layout/LayoutTableCaption.h" |
64 #include "core/layout/LayoutTableCell.h" | 64 #include "core/layout/LayoutTableCell.h" |
65 #include "core/layout/LayoutTableCol.h" | 65 #include "core/layout/LayoutTableCol.h" |
66 #include "core/layout/LayoutTableRow.h" | 66 #include "core/layout/LayoutTableRow.h" |
67 #include "core/layout/LayoutTheme.h" | 67 #include "core/layout/LayoutTheme.h" |
68 #include "core/layout/LayoutView.h" | 68 #include "core/layout/LayoutView.h" |
| 69 #include "core/layout/ng/LayoutNGBlockFlow.h" |
69 #include "core/page/AutoscrollController.h" | 70 #include "core/page/AutoscrollController.h" |
70 #include "core/page/Page.h" | 71 #include "core/page/Page.h" |
71 #include "core/paint/ObjectPaintProperties.h" | 72 #include "core/paint/ObjectPaintProperties.h" |
72 #include "core/paint/PaintLayer.h" | 73 #include "core/paint/PaintLayer.h" |
73 #include "core/style/ContentData.h" | 74 #include "core/style/ContentData.h" |
74 #include "core/style/CursorData.h" | 75 #include "core/style/CursorData.h" |
75 #include "platform/HostWindow.h" | 76 #include "platform/HostWindow.h" |
76 #include "platform/RuntimeEnabledFeatures.h" | 77 #include "platform/RuntimeEnabledFeatures.h" |
77 #include "platform/TracedValue.h" | 78 #include "platform/TracedValue.h" |
78 #include "platform/geometry/TransformState.h" | 79 #include "platform/geometry/TransformState.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 return image; | 181 return image; |
181 } | 182 } |
182 | 183 |
183 switch (style.display()) { | 184 switch (style.display()) { |
184 case NONE: | 185 case NONE: |
185 return nullptr; | 186 return nullptr; |
186 case INLINE: | 187 case INLINE: |
187 return new LayoutInline(element); | 188 return new LayoutInline(element); |
188 case BLOCK: | 189 case BLOCK: |
189 case INLINE_BLOCK: | 190 case INLINE_BLOCK: |
| 191 if (RuntimeEnabledFeatures::layoutNGEnabled()) |
| 192 return new LayoutNGBlockFlow(element); |
190 return new LayoutBlockFlow(element); | 193 return new LayoutBlockFlow(element); |
191 case LIST_ITEM: | 194 case LIST_ITEM: |
192 return new LayoutListItem(element); | 195 return new LayoutListItem(element); |
193 case TABLE: | 196 case TABLE: |
194 case INLINE_TABLE: | 197 case INLINE_TABLE: |
195 return new LayoutTable(element); | 198 return new LayoutTable(element); |
196 case TABLE_ROW_GROUP: | 199 case TABLE_ROW_GROUP: |
197 case TABLE_HEADER_GROUP: | 200 case TABLE_HEADER_GROUP: |
198 case TABLE_FOOTER_GROUP: | 201 case TABLE_FOOTER_GROUP: |
199 return new LayoutTableSection(element); | 202 return new LayoutTableSection(element); |
(...skipping 3450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3650 const blink::LayoutObject* root = object1; | 3653 const blink::LayoutObject* root = object1; |
3651 while (root->parent()) | 3654 while (root->parent()) |
3652 root = root->parent(); | 3655 root = root->parent(); |
3653 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3656 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
3654 } else { | 3657 } else { |
3655 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3658 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
3656 } | 3659 } |
3657 } | 3660 } |
3658 | 3661 |
3659 #endif | 3662 #endif |
OLD | NEW |