| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 visual.init(); | 121 visual.init(); |
| 122 m_background.init(); | 122 m_background.init(); |
| 123 surround.init(); | 123 surround.init(); |
| 124 rareNonInheritedData.init(); | 124 rareNonInheritedData.init(); |
| 125 rareNonInheritedData.access()->m_deprecatedFlexibleBox.init(); | 125 rareNonInheritedData.access()->m_deprecatedFlexibleBox.init(); |
| 126 rareNonInheritedData.access()->m_flexibleBox.init(); | 126 rareNonInheritedData.access()->m_flexibleBox.init(); |
| 127 rareNonInheritedData.access()->m_multiCol.init(); | 127 rareNonInheritedData.access()->m_multiCol.init(); |
| 128 rareNonInheritedData.access()->m_transform.init(); | 128 rareNonInheritedData.access()->m_transform.init(); |
| 129 rareNonInheritedData.access()->m_willChange.init(); | 129 rareNonInheritedData.access()->m_willChange.init(); |
| 130 rareNonInheritedData.access()->m_filter.init(); | 130 rareNonInheritedData.access()->m_filter.init(); |
| 131 rareNonInheritedData.access()->m_backdropFilter.init(); |
| 131 rareNonInheritedData.access()->m_grid.init(); | 132 rareNonInheritedData.access()->m_grid.init(); |
| 132 rareNonInheritedData.access()->m_gridItem.init(); | 133 rareNonInheritedData.access()->m_gridItem.init(); |
| 133 rareNonInheritedData.access()->m_scrollSnap.init(); | 134 rareNonInheritedData.access()->m_scrollSnap.init(); |
| 134 rareInheritedData.init(); | 135 rareInheritedData.init(); |
| 135 inherited.init(); | 136 inherited.init(); |
| 136 m_svgStyle.init(); | 137 m_svgStyle.init(); |
| 137 } | 138 } |
| 138 | 139 |
| 139 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o) | 140 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o) |
| 140 : RefCounted<ComputedStyle>() | 141 : RefCounted<ComputedStyle>() |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 | 728 |
| 728 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { | 729 if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) { |
| 729 if (!transformDataEquivalent(other)) | 730 if (!transformDataEquivalent(other)) |
| 730 diff.setTransformChanged(); | 731 diff.setTransformChanged(); |
| 731 | 732 |
| 732 if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity
) | 733 if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity
) |
| 733 diff.setOpacityChanged(); | 734 diff.setOpacityChanged(); |
| 734 | 735 |
| 735 if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filt
er) | 736 if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filt
er) |
| 736 diff.setFilterChanged(); | 737 diff.setFilterChanged(); |
| 738 |
| 739 if (rareNonInheritedData->m_backdropFilter != other.rareNonInheritedData
->m_backdropFilter) |
| 740 diff.setBackdropFilterChanged(); |
| 737 } | 741 } |
| 738 | 742 |
| 739 if (!diff.needsPaintInvalidation()) { | 743 if (!diff.needsPaintInvalidation()) { |
| 740 if (inherited->color != other.inherited->color | 744 if (inherited->color != other.inherited->color |
| 741 || inherited->visitedLinkColor != other.inherited->visitedLinkColor | 745 || inherited->visitedLinkColor != other.inherited->visitedLinkColor |
| 742 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline | 746 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn
derline |
| 743 || visual->textDecoration != other.visual->textDecoration) { | 747 || visual->textDecoration != other.visual->textDecoration) { |
| 744 diff.setTextOrColorChanged(); | 748 diff.setTextOrColorChanged(); |
| 745 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
) | 749 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get(
) |
| 746 && (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle | 750 && (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe
ritedData->m_textDecorationStyle |
| (...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 { | 1679 { |
| 1676 return LayoutTheme::tapHighlightColor(); | 1680 return LayoutTheme::tapHighlightColor(); |
| 1677 } | 1681 } |
| 1678 | 1682 |
| 1679 #if ENABLE(OILPAN) | 1683 #if ENABLE(OILPAN) |
| 1680 const FilterOperations& ComputedStyle::initialFilter() | 1684 const FilterOperations& ComputedStyle::initialFilter() |
| 1681 { | 1685 { |
| 1682 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati
onsWrapper::create())); | 1686 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati
onsWrapper::create())); |
| 1683 return ops->operations(); | 1687 return ops->operations(); |
| 1684 } | 1688 } |
| 1689 |
| 1690 const FilterOperations& ComputedStyle::initialBackdropFilter() |
| 1691 { |
| 1692 DEFINE_STATIC_LOCAL(Persistent<FilterOperationsWrapper>, ops, (FilterOperati
onsWrapper::create())); |
| 1693 return ops->operations(); |
| 1694 } |
| 1685 #endif | 1695 #endif |
| 1686 | 1696 |
| 1687 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const | 1697 LayoutRectOutsets ComputedStyle::imageOutsets(const NinePieceImage& image) const |
| 1688 { | 1698 { |
| 1689 return LayoutRectOutsets( | 1699 return LayoutRectOutsets( |
| 1690 NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()), | 1700 NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()), |
| 1691 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()
), | 1701 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()
), |
| 1692 NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth
()), | 1702 NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth
()), |
| 1693 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()))
; | 1703 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()))
; |
| 1694 } | 1704 } |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1775 } | 1785 } |
| 1776 | 1786 |
| 1777 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) | 1787 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) |
| 1778 { | 1788 { |
| 1779 setEmptyState(other.emptyState()); | 1789 setEmptyState(other.emptyState()); |
| 1780 if (other.hasExplicitlyInheritedProperties()) | 1790 if (other.hasExplicitlyInheritedProperties()) |
| 1781 setHasExplicitlyInheritedProperties(); | 1791 setHasExplicitlyInheritedProperties(); |
| 1782 } | 1792 } |
| 1783 | 1793 |
| 1784 } // namespace blink | 1794 } // namespace blink |
| OLD | NEW |