| 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.
      All rights reserved. | 5  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
      All rights reserved. | 
| 6  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 
| 7  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 
| 8  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
     orchmobile.com/) | 8  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
     orchmobile.com/) | 
| 9  * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9  * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 
| 10  * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10  * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 104     case INLINE_TABLE: | 104     case INLINE_TABLE: | 
| 105         return TABLE; | 105         return TABLE; | 
| 106     case INLINE_BOX: | 106     case INLINE_BOX: | 
| 107         return BOX; | 107         return BOX; | 
| 108     case INLINE_FLEX: | 108     case INLINE_FLEX: | 
| 109         return FLEX; | 109         return FLEX; | 
| 110     case INLINE_GRID: | 110     case INLINE_GRID: | 
| 111         return GRID; | 111         return GRID; | 
| 112 | 112 | 
| 113     case INLINE: | 113     case INLINE: | 
| 114     case RUN_IN: |  | 
| 115     case COMPACT: | 114     case COMPACT: | 
| 116     case INLINE_BLOCK: | 115     case INLINE_BLOCK: | 
| 117     case TABLE_ROW_GROUP: | 116     case TABLE_ROW_GROUP: | 
| 118     case TABLE_HEADER_GROUP: | 117     case TABLE_HEADER_GROUP: | 
| 119     case TABLE_FOOTER_GROUP: | 118     case TABLE_FOOTER_GROUP: | 
| 120     case TABLE_ROW: | 119     case TABLE_ROW: | 
| 121     case TABLE_COLUMN_GROUP: | 120     case TABLE_COLUMN_GROUP: | 
| 122     case TABLE_COLUMN: | 121     case TABLE_COLUMN: | 
| 123     case TABLE_CELL: | 122     case TABLE_CELL: | 
| 124     case TABLE_CAPTION: | 123     case TABLE_CAPTION: | 
| 125         return BLOCK; | 124         return BLOCK; | 
| 126     case NONE: | 125     case NONE: | 
| 127         ASSERT_NOT_REACHED(); | 126         ASSERT_NOT_REACHED(); | 
| 128         return NONE; | 127         return NONE; | 
| 129     } | 128     } | 
| 130     ASSERT_NOT_REACHED(); | 129     ASSERT_NOT_REACHED(); | 
| 131     return BLOCK; | 130     return BLOCK; | 
| 132 } | 131 } | 
| 133 | 132 | 
| 134 // CSS requires text-decoration to be reset at each DOM element for tables, | 133 // CSS requires text-decoration to be reset at each DOM element for tables, | 
| 135 // inline blocks, inline tables, run-ins, shadow DOM crossings, floating element
     s, | 134 // inline blocks, inline tables, shadow DOM crossings, floating elements, | 
| 136 // and absolute or relatively positioned elements. | 135 // and absolute or relatively positioned elements. | 
| 137 static bool doesNotInheritTextDecoration(const RenderStyle* style, const Element
     * e) | 136 static bool doesNotInheritTextDecoration(const RenderStyle* style, const Element
     * e) | 
| 138 { | 137 { | 
| 139     return style->display() == TABLE || style->display() == INLINE_TABLE || styl
     e->display() == RUN_IN | 138     return style->display() == TABLE || style->display() == INLINE_TABLE | 
| 140         || style->display() == INLINE_BLOCK || style->display() == INLINE_BOX ||
      isAtShadowBoundary(e) | 139         || style->display() == INLINE_BLOCK || style->display() == INLINE_BOX ||
      isAtShadowBoundary(e) | 
| 141         || style->isFloating() || style->hasOutOfFlowPosition(); | 140         || style->isFloating() || style->hasOutOfFlowPosition(); | 
| 142 } | 141 } | 
| 143 | 142 | 
| 144 // FIXME: This helper is only needed because pseudoStyleForElement passes a null | 143 // FIXME: This helper is only needed because pseudoStyleForElement passes a null | 
| 145 // element to adjustRenderStyle, so we can't just use element->isInTopLayer(). | 144 // element to adjustRenderStyle, so we can't just use element->isInTopLayer(). | 
| 146 static bool isInTopLayer(const Element* element, const RenderStyle* style) | 145 static bool isInTopLayer(const Element* element, const RenderStyle* style) | 
| 147 { | 146 { | 
| 148     return (element && element->isInTopLayer()) || (style && style->styleType() 
     == BACKDROP); | 147     return (element && element->isInTopLayer()) || (style && style->styleType() 
     == BACKDROP); | 
| 149 } | 148 } | 
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 413     if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ | 412     if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ | 
| 414         style->setGrid##Prop(GridPosition()); | 413         style->setGrid##Prop(GridPosition()); | 
| 415 | 414 | 
| 416     CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); | 415     CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); | 
| 417     CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); | 416     CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); | 
| 418     CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); | 417     CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); | 
| 419     CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); | 418     CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); | 
| 420 } | 419 } | 
| 421 | 420 | 
| 422 } | 421 } | 
| OLD | NEW | 
|---|