Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1345833003: Revert of Invalidate whitespace text on text color changes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/style/StyleDifference.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 737
738 if (rareNonInheritedData->m_backdropFilter != other.rareNonInheritedData ->m_backdropFilter) 738 if (rareNonInheritedData->m_backdropFilter != other.rareNonInheritedData ->m_backdropFilter)
739 diff.setBackdropFilterChanged(); 739 diff.setBackdropFilterChanged();
740 } 740 }
741 741
742 if (!diff.needsPaintInvalidation()) { 742 if (!diff.needsPaintInvalidation()) {
743 if (inherited->color != other.inherited->color 743 if (inherited->color != other.inherited->color
744 || inherited->visitedLinkColor != other.inherited->visitedLinkColor 744 || inherited->visitedLinkColor != other.inherited->visitedLinkColor
745 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn derline 745 || inherited_flags.m_textUnderline != other.inherited_flags.m_textUn derline
746 || visual->textDecoration != other.visual->textDecoration) { 746 || visual->textDecoration != other.visual->textDecoration) {
747 diff.setTextDecorationOrColorChanged(); 747 diff.setTextOrColorChanged();
748 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get( ) 748 } else if (rareNonInheritedData.get() != other.rareNonInheritedData.get( )
749 && (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe ritedData->m_textDecorationStyle 749 && (rareNonInheritedData->m_textDecorationStyle != other.rareNonInhe ritedData->m_textDecorationStyle
750 || rareNonInheritedData->m_textDecorationColor != other.rareNonI nheritedData->m_textDecorationColor 750 || rareNonInheritedData->m_textDecorationColor != other.rareNonI nheritedData->m_textDecorationColor
751 || rareNonInheritedData->m_visitedLinkTextDecorationColor != oth er.rareNonInheritedData->m_visitedLinkTextDecorationColor)) { 751 || rareNonInheritedData->m_visitedLinkTextDecorationColor != oth er.rareNonInheritedData->m_visitedLinkTextDecorationColor)) {
752 diff.setTextDecorationOrColorChanged(); 752 diff.setTextOrColorChanged();
753 } else if (rareInheritedData.get() != other.rareInheritedData.get() 753 } else if (rareInheritedData.get() != other.rareInheritedData.get()
754 && (rareInheritedData->textFillColor() != other.rareInheritedData->t extFillColor() 754 && (rareInheritedData->textFillColor() != other.rareInheritedData->t extFillColor()
755 || rareInheritedData->textStrokeColor() != other.rareInheritedDa ta->textStrokeColor() 755 || rareInheritedData->textStrokeColor() != other.rareInheritedDa ta->textStrokeColor()
756 || rareInheritedData->textEmphasisColor() != other.rareInherited Data->textEmphasisColor() 756 || rareInheritedData->textEmphasisColor() != other.rareInherited Data->textEmphasisColor()
757 || rareInheritedData->visitedLinkTextFillColor() != other.rareIn heritedData->visitedLinkTextFillColor() 757 || rareInheritedData->visitedLinkTextFillColor() != other.rareIn heritedData->visitedLinkTextFillColor()
758 || rareInheritedData->visitedLinkTextStrokeColor() != other.rare InheritedData->visitedLinkTextStrokeColor() 758 || rareInheritedData->visitedLinkTextStrokeColor() != other.rare InheritedData->visitedLinkTextStrokeColor()
759 || rareInheritedData->visitedLinkTextEmphasisColor() != other.ra reInheritedData->visitedLinkTextEmphasisColor() 759 || rareInheritedData->visitedLinkTextEmphasisColor() != other.ra reInheritedData->visitedLinkTextEmphasisColor()
760 || rareInheritedData->textEmphasisFill != other.rareInheritedDat a->textEmphasisFill 760 || rareInheritedData->textEmphasisFill != other.rareInheritedDat a->textEmphasisFill
761 || rareInheritedData->appliedTextDecorations != other.rareInheri tedData->appliedTextDecorations)) { 761 || rareInheritedData->appliedTextDecorations != other.rareInheri tedData->appliedTextDecorations)) {
762 diff.setTextDecorationOrColorChanged(); 762 diff.setTextOrColorChanged();
763 } 763 }
764 } 764 }
765 } 765 }
766 766
767 void ComputedStyle::addCursor(PassRefPtrWillBeRawPtr<StyleImage> image, bool hot SpotSpecified, const IntPoint& hotSpot) 767 void ComputedStyle::addCursor(PassRefPtrWillBeRawPtr<StyleImage> image, bool hot SpotSpecified, const IntPoint& hotSpot)
768 { 768 {
769 if (!rareInheritedData.access()->cursorData) { 769 if (!rareInheritedData.access()->cursorData) {
770 #if ENABLE(OILPAN) 770 #if ENABLE(OILPAN)
771 rareInheritedData.access()->cursorData = new CursorList; 771 rareInheritedData.access()->cursorData = new CursorList;
772 #else 772 #else
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after
1798 } 1798 }
1799 1799
1800 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1800 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1801 { 1801 {
1802 setEmptyState(other.emptyState()); 1802 setEmptyState(other.emptyState());
1803 if (other.hasExplicitlyInheritedProperties()) 1803 if (other.hasExplicitlyInheritedProperties())
1804 setHasExplicitlyInheritedProperties(); 1804 setHasExplicitlyInheritedProperties();
1805 } 1805 }
1806 1806
1807 } // namespace blink 1807 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | Source/core/style/StyleDifference.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698