OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 if (inherited_flags._visibility != other->inherited_flags._visibility | 656 if (inherited_flags._visibility != other->inherited_flags._visibility |
657 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC
olorAdjust | 657 || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printC
olorAdjust |
658 || inherited_flags._insideLink != other->inherited_flags._insideLink | 658 || inherited_flags._insideLink != other->inherited_flags._insideLink |
659 || surround->border != other->surround->border | 659 || surround->border != other->surround->border |
660 || *m_background.get() != *other->m_background.get() | 660 || *m_background.get() != *other->m_background.get() |
661 || rareInheritedData->userModify != other->rareInheritedData->userModify | 661 || rareInheritedData->userModify != other->rareInheritedData->userModify |
662 || rareInheritedData->userSelect != other->rareInheritedData->userSelect | 662 || rareInheritedData->userSelect != other->rareInheritedData->userSelect |
663 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr
ag | 663 || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDr
ag |
664 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b
orderFit | 664 || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_b
orderFit |
665 || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_o
bjectFit | 665 || rareNonInheritedData->m_objectFit != other->rareNonInheritedData->m_o
bjectFit |
666 || rareNonInheritedData->m_objectPosition != other->rareNonInheritedData
->m_objectPosition | |
667 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im
ageRendering) | 666 || rareInheritedData->m_imageRendering != other->rareInheritedData->m_im
ageRendering) |
668 return StyleDifferenceRepaint; | 667 return StyleDifferenceRepaint; |
669 | 668 |
670 // FIXME: The current spec is being reworked to remove dependencies betw
een exclusions and affected | 669 // FIXME: The current spec is being reworked to remove dependencies betw
een exclusions and affected |
671 // content. There's a proposal to use floats instead. In that case, wrap
-shape should actually relayout | 670 // content. There's a proposal to use floats instead. In that case, wrap
-shape should actually relayout |
672 // the parent container. For sure, I will have to revisit this code, but
for now I've added this in order | 671 // the parent container. For sure, I will have to revisit this code, but
for now I've added this in order |
673 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu
ally differ. | 672 // to avoid having diff() == StyleDifferenceEqual where wrap-shapes actu
ally differ. |
674 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991 | 673 // Tracking bug: https://bugs.webkit.org/show_bug.cgi?id=62991 |
675 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData-
>m_shapeOutside) | 674 if (rareNonInheritedData->m_shapeOutside != other->rareNonInheritedData-
>m_shapeOutside) |
676 return StyleDifferenceRepaint; | 675 return StyleDifferenceRepaint; |
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1612 surround.access()->border.m_image.setOutset(outset); | 1611 surround.access()->border.m_image.setOutset(outset); |
1613 } | 1612 } |
1614 | 1613 |
1615 ShapeValue* RenderStyle::initialShapeInside() | 1614 ShapeValue* RenderStyle::initialShapeInside() |
1616 { | 1615 { |
1617 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); | 1616 DEFINE_STATIC_LOCAL(RefPtr<ShapeValue>, sOutsideValue, (ShapeValue::createOu
tsideValue())); |
1618 return sOutsideValue.get(); | 1617 return sOutsideValue.get(); |
1619 } | 1618 } |
1620 | 1619 |
1621 } // namespace WebCore | 1620 } // namespace WebCore |
OLD | NEW |