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

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

Issue 1070313003: Remove page-break properties and captions (Closed) Base URL: git@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
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 rareNonInheritedData = other->rareNonInheritedData; 173 rareNonInheritedData = other->rareNonInheritedData;
174 // The flags are copied one-by-one because noninherited_flags contains a bun ch of stuff other than real style data. 174 // The flags are copied one-by-one because noninherited_flags contains a bun ch of stuff other than real style data.
175 noninherited_flags.effectiveDisplay = other->noninherited_flags.effectiveDis play; 175 noninherited_flags.effectiveDisplay = other->noninherited_flags.effectiveDis play;
176 noninherited_flags.originalDisplay = other->noninherited_flags.originalDispl ay; 176 noninherited_flags.originalDisplay = other->noninherited_flags.originalDispl ay;
177 noninherited_flags.overflowX = other->noninherited_flags.overflowX; 177 noninherited_flags.overflowX = other->noninherited_flags.overflowX;
178 noninherited_flags.overflowY = other->noninherited_flags.overflowY; 178 noninherited_flags.overflowY = other->noninherited_flags.overflowY;
179 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign; 179 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign;
180 noninherited_flags.position = other->noninherited_flags.position; 180 noninherited_flags.position = other->noninherited_flags.position;
181 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout; 181 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout;
182 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi; 182 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi;
183 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo re;
184 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter ;
185 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi de;
186 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance; 183 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance;
187 noninherited_flags.currentColor = other->noninherited_flags.currentColor; 184 noninherited_flags.currentColor = other->noninherited_flags.currentColor;
188 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits; 185 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits;
189 } 186 }
190 187
191 bool RenderStyle::operator==(const RenderStyle& o) const 188 bool RenderStyle::operator==(const RenderStyle& o) const
192 { 189 {
193 // compare everything except the pseudoStyle pointer 190 // compare everything except the pseudoStyle pointer
194 return inherited_flags == o.inherited_flags 191 return inherited_flags == o.inherited_flags
195 && noninherited_flags == o.noninherited_flags 192 && noninherited_flags == o.noninherited_flags
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
1142 // right 1139 // right
1143 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1140 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1144 if (radiiSum > rect.height()) 1141 if (radiiSum > rect.height())
1145 factor = std::min(rect.height() / radiiSum, factor); 1142 factor = std::min(rect.height() / radiiSum, factor);
1146 1143
1147 ASSERT(factor <= 1); 1144 ASSERT(factor <= 1);
1148 return factor; 1145 return factor;
1149 } 1146 }
1150 1147
1151 } // namespace blink 1148 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | sky/engine/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698