| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 case EDisplay::kTableRowGroup: | 81 case EDisplay::kTableRowGroup: |
| 82 case EDisplay::kTableHeaderGroup: | 82 case EDisplay::kTableHeaderGroup: |
| 83 case EDisplay::kTableFooterGroup: | 83 case EDisplay::kTableFooterGroup: |
| 84 case EDisplay::kTableRow: | 84 case EDisplay::kTableRow: |
| 85 case EDisplay::kTableColumnGroup: | 85 case EDisplay::kTableColumnGroup: |
| 86 case EDisplay::kTableColumn: | 86 case EDisplay::kTableColumn: |
| 87 case EDisplay::kTableCell: | 87 case EDisplay::kTableCell: |
| 88 case EDisplay::kTableCaption: | 88 case EDisplay::kTableCaption: |
| 89 return EDisplay::kBlock; | 89 return EDisplay::kBlock; |
| 90 case EDisplay::kNone: | 90 case EDisplay::kNone: |
| 91 ASSERT_NOT_REACHED(); | 91 NOTREACHED(); |
| 92 return display; | 92 return display; |
| 93 } | 93 } |
| 94 ASSERT_NOT_REACHED(); | 94 NOTREACHED(); |
| 95 return EDisplay::kBlock; | 95 return EDisplay::kBlock; |
| 96 } | 96 } |
| 97 | 97 |
| 98 static bool isOutermostSVGElement(const Element* element) { | 98 static bool isOutermostSVGElement(const Element* element) { |
| 99 return element && element->isSVGElement() && | 99 return element && element->isSVGElement() && |
| 100 toSVGElement(*element).isOutermostSVGSVGElement(); | 100 toSVGElement(*element).isOutermostSVGSVGElement(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 // CSS requires text-decoration to be reset at each DOM element for | 103 // CSS requires text-decoration to be reset at each DOM element for |
| 104 // inline blocks, inline tables, shadow DOM crossings, floating elements, | 104 // inline blocks, inline tables, shadow DOM crossings, floating elements, |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 style.setDisplay(EDisplay::kBlock); | 506 style.setDisplay(EDisplay::kBlock); |
| 507 | 507 |
| 508 // Columns don't apply to svg text elements. | 508 // Columns don't apply to svg text elements. |
| 509 if (isSVGTextElement(*element)) | 509 if (isSVGTextElement(*element)) |
| 510 style.clearMultiCol(); | 510 style.clearMultiCol(); |
| 511 } | 511 } |
| 512 adjustStyleForAlignment(style, layoutParentStyle); | 512 adjustStyleForAlignment(style, layoutParentStyle); |
| 513 } | 513 } |
| 514 | 514 |
| 515 } // namespace blink | 515 } // namespace blink |
| OLD | NEW |