Chromium Code Reviews| 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 865 || m_rareInheritedData->textStrokeColor() != other.m_rareInherit edData->textStrokeColor() | 865 || m_rareInheritedData->textStrokeColor() != other.m_rareInherit edData->textStrokeColor() |
| 866 || m_rareInheritedData->textEmphasisColor() != other.m_rareInher itedData->textEmphasisColor() | 866 || m_rareInheritedData->textEmphasisColor() != other.m_rareInher itedData->textEmphasisColor() |
| 867 || m_rareInheritedData->visitedLinkTextFillColor() != other.m_ra reInheritedData->visitedLinkTextFillColor() | 867 || m_rareInheritedData->visitedLinkTextFillColor() != other.m_ra reInheritedData->visitedLinkTextFillColor() |
| 868 || m_rareInheritedData->visitedLinkTextStrokeColor() != other.m_ rareInheritedData->visitedLinkTextStrokeColor() | 868 || m_rareInheritedData->visitedLinkTextStrokeColor() != other.m_ rareInheritedData->visitedLinkTextStrokeColor() |
| 869 || m_rareInheritedData->visitedLinkTextEmphasisColor() != other. m_rareInheritedData->visitedLinkTextEmphasisColor() | 869 || m_rareInheritedData->visitedLinkTextEmphasisColor() != other. m_rareInheritedData->visitedLinkTextEmphasisColor() |
| 870 || m_rareInheritedData->textEmphasisFill != other.m_rareInherite dData->textEmphasisFill | 870 || m_rareInheritedData->textEmphasisFill != other.m_rareInherite dData->textEmphasisFill |
| 871 || m_rareInheritedData->appliedTextDecorations != other.m_rareIn heritedData->appliedTextDecorations)) { | 871 || m_rareInheritedData->appliedTextDecorations != other.m_rareIn heritedData->appliedTextDecorations)) { |
| 872 diff.setTextDecorationOrColorChanged(); | 872 diff.setTextDecorationOrColorChanged(); |
| 873 } | 873 } |
| 874 } | 874 } |
| 875 | |
| 876 if (diff.needsLayout() || diff.transformChanged()) | |
|
ojan
2016/08/16 23:54:32
A couple thoughts on this.
1. You need to also che
Bugs Nash
2016/08/17 02:08:46
Isn't that already checked via diff.needsLayout()?
skobes
2016/08/17 18:50:32
As bugsnash noted, needsLayout includes this.
| |
| 877 diff.setLayoutAffectingPropertyChanged(); | |
| 875 } | 878 } |
| 876 | 879 |
| 877 void ComputedStyle::addPaintImage(StyleImage* image) | 880 void ComputedStyle::addPaintImage(StyleImage* image) |
| 878 { | 881 { |
| 879 if (!m_rareNonInheritedData.access()->m_paintImages) | 882 if (!m_rareNonInheritedData.access()->m_paintImages) |
| 880 m_rareNonInheritedData.access()->m_paintImages = WTF::wrapUnique(new Vec tor<Persistent<StyleImage>>()); | 883 m_rareNonInheritedData.access()->m_paintImages = WTF::wrapUnique(new Vec tor<Persistent<StyleImage>>()); |
| 881 m_rareNonInheritedData.access()->m_paintImages->append(image); | 884 m_rareNonInheritedData.access()->m_paintImages->append(image); |
| 882 } | 885 } |
| 883 | 886 |
| 884 void ComputedStyle::addCursor(StyleImage* image, bool hotSpotSpecified, const In tPoint& hotSpot) | 887 void ComputedStyle::addCursor(StyleImage* image, bool hotSpotSpecified, const In tPoint& hotSpot) |
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1966 if (value < 0) | 1969 if (value < 0) |
| 1967 fvalue -= 0.5f; | 1970 fvalue -= 0.5f; |
| 1968 else | 1971 else |
| 1969 fvalue += 0.5f; | 1972 fvalue += 0.5f; |
| 1970 } | 1973 } |
| 1971 | 1974 |
| 1972 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 1975 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
| 1973 } | 1976 } |
| 1974 | 1977 |
| 1975 } // namespace blink | 1978 } // namespace blink |
| OLD | NEW |