Source/core/layout/style/LayoutStyle.h - Issue 950623002: Store resolved color in AppliedTextDecoration

Side by Side Diff: Source/core/layout/style/LayoutStyle.h

Issue 950623002: Store resolved color in AppliedTextDecoration (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Updated patch with underline optimization handling Created 5 years, 9 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

« Source/core/layout/LayoutObject.cpp ('K') | « Source/core/layout/style/AppliedTextDecoration.cpp ('k') | Source/core/layout/style/LayoutStyle.cpp » ('j') | Source/core/layout/style/LayoutStyle.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.

6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)	6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 1076 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1087 void setTextAutosizingMultiplier(float);	1087 void setTextAutosizingMultiplier(float);

1088	1088

1089 void setColor(const Color&);	1089 void setColor(const Color&);

1090 void setTextIndent(const Length& v) { SET_VAR(rareInheritedData, indent, v); }	1090 void setTextIndent(const Length& v) { SET_VAR(rareInheritedData, indent, v); }

1091 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }	1091 void setTextIndentLine(TextIndentLine v) { SET_VAR(rareInheritedData, m_text IndentLine, v); }

1092 void setTextIndentType(TextIndentType v) { SET_VAR(rareInheritedData, m_text IndentType, v); }	1092 void setTextIndentType(TextIndentType v) { SET_VAR(rareInheritedData, m_text IndentType, v); }

1093 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }	1093 void setTextAlign(ETextAlign v) { inherited_flags._text_align = v; }

1094 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }	1094 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAl ignLast, v); }

1095 void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustif y, v); }	1095 void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustif y, v); }

1096 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }	1096 void setTextTransform(ETextTransform v) { inherited_flags._text_transform = v; }

	1097

	1098 bool hasSimpleUnderlineTextDecoration();

	1099 void adjustTextDecorationDifference();

1097 void applyTextDecorations();	1100 void applyTextDecorations();

1098 void clearAppliedTextDecorations();	1101 void clearAppliedTextDecorations();

1099 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }	1102 void setTextDecoration(TextDecoration v) { SET_VAR(visual, textDecoration, v ); }

1100 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }	1103 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInherit edData, m_textUnderlinePosition, v); }

1101 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }	1104 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInherite dData, m_textDecorationStyle, v); }

1102 void setDirection(TextDirection v) { inherited_flags._direction = v; }	1105 void setDirection(TextDirection v) { inherited_flags._direction = v; }

1103 void setSelfOrAncestorHasDirAutoAttribute(bool v) { SET_VAR(rareInheritedDat a, m_selfOrAncestorHasDirAutoAttribute, v); }	1106 void setSelfOrAncestorHasDirAutoAttribute(bool v) { SET_VAR(rareInheritedDat a, m_selfOrAncestorHasDirAutoAttribute, v); }

1104 void setLineHeight(const Length& specifiedLineHeight);	1107 void setLineHeight(const Length& specifiedLineHeight);

1105 bool setZoom(float);	1108 bool setZoom(float);

1106 bool setEffectiveZoom(float);	1109 bool setEffectiveZoom(float);

(...skipping 766 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1873 }	1876 }

1874	1877

1875 inline bool LayoutStyle::hasPseudoElementStyle() const	1878 inline bool LayoutStyle::hasPseudoElementStyle() const

1876 {	1879 {

1877 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;	1880 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;

1878 }	1881 }

1879	1882

1880 } // namespace blink	1883 } // namespace blink

1881	1884

1882 #endif // LayoutStyle_h	1885 #endif // LayoutStyle_h

OLD	NEW