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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.h

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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
OLDNEW
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 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 bool shadowDataEquivalent(const StyleRareInheritedData&) const; 58 bool shadowDataEquivalent(const StyleRareInheritedData&) const;
59 59
60 void reportMemoryUsage(MemoryObjectInfo*) const; 60 void reportMemoryUsage(MemoryObjectInfo*) const;
61 61
62 RefPtr<StyleImage> listStyleImage; 62 RefPtr<StyleImage> listStyleImage;
63 63
64 Color textStrokeColor; 64 Color textStrokeColor;
65 float textStrokeWidth; 65 float textStrokeWidth;
66 Color textFillColor; 66 Color textFillColor;
67 Color textEmphasisColor; 67 Color textEmphasisColor;
68 68
69 Color visitedLinkTextStrokeColor; 69 Color visitedLinkTextStrokeColor;
70 Color visitedLinkTextFillColor; 70 Color visitedLinkTextFillColor;
71 Color visitedLinkTextEmphasisColor; 71 Color visitedLinkTextEmphasisColor;
72 72
73 OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed t ext drawing. 73 OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed t ext drawing.
74 AtomicString highlight; // Apple-specific extension for custom highlight ren dering. 74 AtomicString highlight; // Apple-specific extension for custom highlight ren dering.
75 75
76 RefPtr<CursorList> cursorData; 76 RefPtr<CursorList> cursorData;
77 Length indent; 77 Length indent;
78 float m_effectiveZoom; 78 float m_effectiveZoom;
79 79
80 // Paged media properties. 80 // Paged media properties.
81 short widows; 81 short widows;
82 short orphans; 82 short orphans;
83 unsigned m_hasAutoWidows : 1; 83 unsigned m_hasAutoWidows : 1;
84 unsigned m_hasAutoOrphans : 1; 84 unsigned m_hasAutoOrphans : 1;
85 85
86 unsigned textSecurity : 2; // ETextSecurity 86 unsigned textSecurity : 2; // ETextSecurity
87 unsigned userModify : 2; // EUserModify (editing) 87 unsigned userModify : 2; // EUserModify (editing)
88 unsigned wordBreak : 2; // EWordBreak 88 unsigned wordBreak : 2; // EWordBreak
89 unsigned overflowWrap : 1; // EOverflowWrap 89 unsigned overflowWrap : 1; // EOverflowWrap
90 unsigned lineBreak : 3; // LineBreak 90 unsigned lineBreak : 3; // LineBreak
91 unsigned resize : 2; // EResize 91 unsigned resize : 2; // EResize
92 unsigned userSelect : 2; // EUserSelect 92 unsigned userSelect : 2; // EUserSelect
93 unsigned colorSpace : 1; // ColorSpace
94 unsigned speak : 3; // ESpeak 93 unsigned speak : 3; // ESpeak
95 unsigned hyphens : 2; // Hyphens 94 unsigned hyphens : 2; // Hyphens
96 unsigned textEmphasisFill : 1; // TextEmphasisFill 95 unsigned textEmphasisFill : 1; // TextEmphasisFill
97 unsigned textEmphasisMark : 3; // TextEmphasisMark 96 unsigned textEmphasisMark : 3; // TextEmphasisMark
98 unsigned textEmphasisPosition : 1; // TextEmphasisPosition 97 unsigned textEmphasisPosition : 1; // TextEmphasisPosition
99 unsigned m_textOrientation : 2; // TextOrientation 98 unsigned m_textOrientation : 2; // TextOrientation
100 #if ENABLE(CSS3_TEXT) 99 #if ENABLE(CSS3_TEXT)
101 unsigned m_textIndentLine : 1; // TextIndentEachLine 100 unsigned m_textIndentLine : 1; // TextIndentEachLine
102 #endif 101 #endif
103 unsigned m_lineBoxContain: 7; // LineBoxContain 102 unsigned m_lineBoxContain: 7; // LineBoxContain
(...skipping 28 matching lines...) Expand all
132 DataRef<StyleVariableData> m_variables; 131 DataRef<StyleVariableData> m_variables;
133 132
134 private: 133 private:
135 StyleRareInheritedData(); 134 StyleRareInheritedData();
136 StyleRareInheritedData(const StyleRareInheritedData&); 135 StyleRareInheritedData(const StyleRareInheritedData&);
137 }; 136 };
138 137
139 } // namespace WebCore 138 } // namespace WebCore
140 139
141 #endif // StyleRareInheritedData_h 140 #endif // StyleRareInheritedData_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698