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

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

Issue 1068073002: drop 'orphan' property (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | 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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 void* refPtrs[3]; 43 void* refPtrs[3];
44 Length lengths[1]; 44 Length lengths[1];
45 unsigned m_bitfields[2]; 45 unsigned m_bitfields[2];
46 short pagedMediaShorts[2]; 46 short pagedMediaShorts[2];
47 unsigned unsigneds[1]; 47 unsigned unsigneds[1];
48 short hyphenationShorts[3]; 48 short hyphenationShorts[3];
49 49
50 Color touchColors; 50 Color touchColors;
51 }; 51 };
52 52
53 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 53 // TODO(ianh): The size of this thing is in total flux, since many of these pr operties are going to go away.
54 // If we keep some then we should rework out the right size.
55 //COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareI nheritedData), StyleRareInheritedData_should_bit_pack);
ojan 2015/04/08 00:05:44 We should either update the size or delete the ass
54 56
55 StyleRareInheritedData::StyleRareInheritedData() 57 StyleRareInheritedData::StyleRareInheritedData()
56 : listStyleImage(RenderStyle::initialListStyleImage()) 58 : listStyleImage(RenderStyle::initialListStyleImage())
57 , textStrokeWidth(RenderStyle::initialTextStrokeWidth()) 59 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
58 , indent(RenderStyle::initialTextIndent()) 60 , indent(RenderStyle::initialTextIndent())
59 , widows(RenderStyle::initialWidows()) 61 , widows(RenderStyle::initialWidows())
60 , orphans(RenderStyle::initialOrphans())
61 , m_hasAutoWidows(true) 62 , m_hasAutoWidows(true)
62 , m_hasAutoOrphans(true)
63 , m_textStrokeColorIsCurrentColor(true) 63 , m_textStrokeColorIsCurrentColor(true)
64 , m_textFillColorIsCurrentColor(true) 64 , m_textFillColorIsCurrentColor(true)
65 , m_textEmphasisColorIsCurrentColor(true) 65 , m_textEmphasisColorIsCurrentColor(true)
66 , userModify(READ_ONLY) 66 , userModify(READ_ONLY)
67 , wordBreak(RenderStyle::initialWordBreak()) 67 , wordBreak(RenderStyle::initialWordBreak())
68 , overflowWrap(RenderStyle::initialOverflowWrap()) 68 , overflowWrap(RenderStyle::initialOverflowWrap())
69 , lineBreak(LineBreakAuto) 69 , lineBreak(LineBreakAuto)
70 , userSelect(RenderStyle::initialUserSelect()) 70 , userSelect(RenderStyle::initialUserSelect())
71 , speak(SpeakNormal) 71 , speak(SpeakNormal)
72 , hyphens(HyphensManual) 72 , hyphens(HyphensManual)
(...skipping 23 matching lines...) Expand all
96 , listStyleImage(o.listStyleImage) 96 , listStyleImage(o.listStyleImage)
97 , m_textStrokeColor(o.m_textStrokeColor) 97 , m_textStrokeColor(o.m_textStrokeColor)
98 , textStrokeWidth(o.textStrokeWidth) 98 , textStrokeWidth(o.textStrokeWidth)
99 , m_textFillColor(o.m_textFillColor) 99 , m_textFillColor(o.m_textFillColor)
100 , m_textEmphasisColor(o.m_textEmphasisColor) 100 , m_textEmphasisColor(o.m_textEmphasisColor)
101 , textShadow(o.textShadow) 101 , textShadow(o.textShadow)
102 , highlight(o.highlight) 102 , highlight(o.highlight)
103 , cursorData(o.cursorData) 103 , cursorData(o.cursorData)
104 , indent(o.indent) 104 , indent(o.indent)
105 , widows(o.widows) 105 , widows(o.widows)
106 , orphans(o.orphans)
107 , m_hasAutoWidows(o.m_hasAutoWidows) 106 , m_hasAutoWidows(o.m_hasAutoWidows)
108 , m_hasAutoOrphans(o.m_hasAutoOrphans)
109 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor) 107 , m_textStrokeColorIsCurrentColor(o.m_textStrokeColorIsCurrentColor)
110 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor) 108 , m_textFillColorIsCurrentColor(o.m_textFillColorIsCurrentColor)
111 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor) 109 , m_textEmphasisColorIsCurrentColor(o.m_textEmphasisColorIsCurrentColor)
112 , userModify(o.userModify) 110 , userModify(o.userModify)
113 , wordBreak(o.wordBreak) 111 , wordBreak(o.wordBreak)
114 , overflowWrap(o.overflowWrap) 112 , overflowWrap(o.overflowWrap)
115 , lineBreak(o.lineBreak) 113 , lineBreak(o.lineBreak)
116 , userSelect(o.userSelect) 114 , userSelect(o.userSelect)
117 , speak(o.speak) 115 , speak(o.speak)
118 , hyphens(o.hyphens) 116 , hyphens(o.hyphens)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 return m_textStrokeColor == o.m_textStrokeColor 148 return m_textStrokeColor == o.m_textStrokeColor
151 && textStrokeWidth == o.textStrokeWidth 149 && textStrokeWidth == o.textStrokeWidth
152 && m_textFillColor == o.m_textFillColor 150 && m_textFillColor == o.m_textFillColor
153 && m_textEmphasisColor == o.m_textEmphasisColor 151 && m_textEmphasisColor == o.m_textEmphasisColor
154 && tapHighlightColor == o.tapHighlightColor 152 && tapHighlightColor == o.tapHighlightColor
155 && shadowDataEquivalent(o) 153 && shadowDataEquivalent(o)
156 && highlight == o.highlight 154 && highlight == o.highlight
157 && dataEquivalent(cursorData.get(), o.cursorData.get()) 155 && dataEquivalent(cursorData.get(), o.cursorData.get())
158 && indent == o.indent 156 && indent == o.indent
159 && widows == o.widows 157 && widows == o.widows
160 && orphans == o.orphans
161 && m_hasAutoWidows == o.m_hasAutoWidows 158 && m_hasAutoWidows == o.m_hasAutoWidows
162 && m_hasAutoOrphans == o.m_hasAutoOrphans
163 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor 159 && m_textStrokeColorIsCurrentColor == o.m_textStrokeColorIsCurrentColor
164 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor 160 && m_textFillColorIsCurrentColor == o.m_textFillColorIsCurrentColor
165 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor 161 && m_textEmphasisColorIsCurrentColor == o.m_textEmphasisColorIsCurrentCo lor
166 && userModify == o.userModify 162 && userModify == o.userModify
167 && wordBreak == o.wordBreak 163 && wordBreak == o.wordBreak
168 && overflowWrap == o.overflowWrap 164 && overflowWrap == o.overflowWrap
169 && lineBreak == o.lineBreak 165 && lineBreak == o.lineBreak
170 && userSelect == o.userSelect 166 && userSelect == o.userSelect
171 && speak == o.speak 167 && speak == o.speak
172 && hyphens == o.hyphens 168 && hyphens == o.hyphens
(...skipping 26 matching lines...) Expand all
199 { 195 {
200 return dataEquivalent(textShadow.get(), o.textShadow.get()); 196 return dataEquivalent(textShadow.get(), o.textShadow.get());
201 } 197 }
202 198
203 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 199 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
204 { 200 {
205 return dataEquivalent(quotes, o.quotes); 201 return dataEquivalent(quotes, o.quotes);
206 } 202 }
207 203
208 } // namespace blink 204 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698