OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
6 * All rights reserved. | 6 * All rights reserved. |
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
76 case EDisplay::Inline: | 76 case EDisplay::Inline: |
77 case EDisplay::InlineBlock: | 77 case EDisplay::InlineBlock: |
78 case EDisplay::TableRowGroup: | 78 case EDisplay::TableRowGroup: |
79 case EDisplay::TableHeaderGroup: | 79 case EDisplay::TableHeaderGroup: |
80 case EDisplay::TableFooterGroup: | 80 case EDisplay::TableFooterGroup: |
81 case EDisplay::TableRow: | 81 case EDisplay::TableRow: |
82 case EDisplay::TableColumnGroup: | 82 case EDisplay::TableColumnGroup: |
83 case EDisplay::TableColumn: | 83 case EDisplay::TableColumn: |
84 case EDisplay::TableCell: | 84 case EDisplay::TableCell: |
85 case EDisplay::TableCaption: | 85 case EDisplay::TableCaption: |
86 case EDisplay::FlowRoot: | |
mstensho (USE GERRIT)
2017/01/09 20:37:58
Shouldn't you just return EDisplay::FlowRoot in th
| |
86 return EDisplay::Block; | 87 return EDisplay::Block; |
87 case EDisplay::None: | 88 case EDisplay::None: |
88 case EDisplay::Contents: | 89 case EDisplay::Contents: |
89 ASSERT_NOT_REACHED(); | 90 ASSERT_NOT_REACHED(); |
90 return display; | 91 return display; |
91 } | 92 } |
92 ASSERT_NOT_REACHED(); | 93 ASSERT_NOT_REACHED(); |
93 return EDisplay::Block; | 94 return EDisplay::Block; |
94 } | 95 } |
95 | 96 |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
476 style.setDisplay(EDisplay::Block); | 477 style.setDisplay(EDisplay::Block); |
477 | 478 |
478 // Columns don't apply to svg text elements. | 479 // Columns don't apply to svg text elements. |
479 if (isSVGTextElement(*element)) | 480 if (isSVGTextElement(*element)) |
480 style.clearMultiCol(); | 481 style.clearMultiCol(); |
481 } | 482 } |
482 adjustStyleForAlignment(style, parentStyle); | 483 adjustStyleForAlignment(style, parentStyle); |
483 } | 484 } |
484 | 485 |
485 } // namespace blink | 486 } // namespace blink |
OLD | NEW |