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

Side by Side Diff: sky/engine/core/rendering/style/StyleRareInheritedData.h

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix ojan's comments Created 5 years, 8 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 float textStrokeWidth; 76 float textStrokeWidth;
77 Color m_textFillColor; 77 Color m_textFillColor;
78 Color m_textEmphasisColor; 78 Color m_textEmphasisColor;
79 79
80 RefPtr<ShadowList> textShadow; // Our text shadow information for shadowed t ext drawing. 80 RefPtr<ShadowList> textShadow; // Our text shadow information for shadowed t ext drawing.
81 AtomicString highlight; // Apple-specific extension for custom highlight ren dering. 81 AtomicString highlight; // Apple-specific extension for custom highlight ren dering.
82 82
83 RefPtr<CursorList> cursorData; 83 RefPtr<CursorList> cursorData;
84 Length indent; 84 Length indent;
85 85
86 // Paged media properties.
87 short widows;
88 short orphans;
89 unsigned m_hasAutoWidows : 1;
90 unsigned m_hasAutoOrphans : 1;
91
92 unsigned m_textStrokeColorIsCurrentColor : 1; 86 unsigned m_textStrokeColorIsCurrentColor : 1;
93 unsigned m_textFillColorIsCurrentColor : 1; 87 unsigned m_textFillColorIsCurrentColor : 1;
94 unsigned m_textEmphasisColorIsCurrentColor : 1; 88 unsigned m_textEmphasisColorIsCurrentColor : 1;
95 89
96 unsigned userModify : 2; // EUserModify (editing) 90 unsigned userModify : 2; // EUserModify (editing)
97 unsigned wordBreak : 2; // EWordBreak 91 unsigned wordBreak : 2; // EWordBreak
98 unsigned overflowWrap : 1; // EOverflowWrap 92 unsigned overflowWrap : 1; // EOverflowWrap
99 unsigned lineBreak : 3; // LineBreak 93 unsigned lineBreak : 3; // LineBreak
100 unsigned userSelect : 2; // EUserSelect 94 unsigned userSelect : 2; // EUserSelect
101 unsigned speak : 3; // ESpeak 95 unsigned speak : 3; // ESpeak
102 unsigned hyphens : 2; // Hyphens 96 unsigned hyphens : 2; // Hyphens
103 unsigned textEmphasisFill : 1; // TextEmphasisFill 97 unsigned textEmphasisFill : 1; // TextEmphasisFill
104 unsigned textEmphasisMark : 3; // TextEmphasisMark 98 unsigned textEmphasisMark : 3; // TextEmphasisMark
105 unsigned textEmphasisPosition : 1; // TextEmphasisPosition 99 unsigned textEmphasisPosition : 1; // TextEmphasisPosition
106 unsigned m_textAlignLast : 3; // TextAlignLast 100 unsigned m_textAlignLast : 3; // TextAlignLast
107 unsigned m_textJustify : 2; // TextJustify 101 unsigned m_textJustify : 2; // TextJustify
108 unsigned m_textOrientation : 2; // TextOrientation 102 unsigned m_textOrientation : 2; // TextOrientation
109 unsigned m_textIndentLine : 1; // TextIndentEachLine 103 unsigned m_textIndentLine : 1; // TextIndentEachLine
110 unsigned m_textIndentType : 1; // TextIndentHanging 104 unsigned m_textIndentType : 1; // TextIndentHanging
111 unsigned m_lineBoxContain: 7; // LineBoxContain 105 unsigned m_lineBoxContain: 7; // LineBoxContain
112 // CSS Image Values Level 3 106 // CSS Image Values Level 3
113 unsigned m_imageRendering : 3; // EImageRendering 107 unsigned m_imageRendering : 3; // EImageRendering
114 unsigned m_textUnderlinePosition : 1; // TextUnderlinePosition 108 unsigned m_textUnderlinePosition : 1; // TextUnderlinePosition
115 unsigned m_touchActionDelay : 1; // TouchActionDelay 109 unsigned m_touchActionDelay : 1; // TouchActionDelay
116 110
117 // Though will-change is not itself an inherited property, the intent 111 // Though will-change is not itself an inherited property, the intent
118 // expressed by 'will-change: contents' includes descendants. 112 // expressed by 'will-change: contents' includes descendants.
119 unsigned m_subtreeWillChangeContents : 1; 113 unsigned m_subtreeWillChangeContents : 1;
120 114
121 AtomicString hyphenationString; 115 // Paged media properties.
116 unsigned m_hasAutoWidows : 1;
117 short widows;
118
122 short hyphenationLimitBefore; 119 short hyphenationLimitBefore;
123 short hyphenationLimitAfter; 120 short hyphenationLimitAfter;
124 short hyphenationLimitLines; 121 short hyphenationLimitLines;
122 AtomicString hyphenationString;
125 123
126 AtomicString locale; 124 AtomicString locale;
127 125
128 AtomicString textEmphasisCustomMark; 126 AtomicString textEmphasisCustomMark;
129 RefPtr<QuotesData> quotes; 127 RefPtr<QuotesData> quotes;
130 128
131 unsigned m_tabSize; 129 unsigned m_tabSize;
132 130
133 Color tapHighlightColor; 131 Color tapHighlightColor;
134 132
135 RefPtr<AppliedTextDecorationList> appliedTextDecorations; 133 RefPtr<AppliedTextDecorationList> appliedTextDecorations;
136 134
137 private: 135 private:
138 StyleRareInheritedData(); 136 StyleRareInheritedData();
139 StyleRareInheritedData(const StyleRareInheritedData&); 137 StyleRareInheritedData(const StyleRareInheritedData&);
140 }; 138 };
141 139
142 } // namespace blink 140 } // namespace blink
143 141
144 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_ 142 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_STYLERAREINHERITEDDATA_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/StyleRareInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698