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

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

Issue 700703002: Remove more float machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 visual = other->visual; 182 visual = other->visual;
183 m_background = other->m_background; 183 m_background = other->m_background;
184 surround = other->surround; 184 surround = other->surround;
185 rareNonInheritedData = other->rareNonInheritedData; 185 rareNonInheritedData = other->rareNonInheritedData;
186 // The flags are copied one-by-one because noninherited_flags contains a bun ch of stuff other than real style data. 186 // The flags are copied one-by-one because noninherited_flags contains a bun ch of stuff other than real style data.
187 noninherited_flags.effectiveDisplay = other->noninherited_flags.effectiveDis play; 187 noninherited_flags.effectiveDisplay = other->noninherited_flags.effectiveDis play;
188 noninherited_flags.originalDisplay = other->noninherited_flags.originalDispl ay; 188 noninherited_flags.originalDisplay = other->noninherited_flags.originalDispl ay;
189 noninherited_flags.overflowX = other->noninherited_flags.overflowX; 189 noninherited_flags.overflowX = other->noninherited_flags.overflowX;
190 noninherited_flags.overflowY = other->noninherited_flags.overflowY; 190 noninherited_flags.overflowY = other->noninherited_flags.overflowY;
191 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign; 191 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign;
192 noninherited_flags.clear = other->noninherited_flags.clear;
193 noninherited_flags.position = other->noninherited_flags.position; 192 noninherited_flags.position = other->noninherited_flags.position;
194 noninherited_flags.floating = other->noninherited_flags.floating;
195 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout; 193 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout;
196 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi; 194 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi;
197 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo re; 195 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo re;
198 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter ; 196 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter ;
199 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi de; 197 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi de;
200 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance; 198 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance;
201 noninherited_flags.currentColor = other->noninherited_flags.currentColor; 199 noninherited_flags.currentColor = other->noninherited_flags.currentColor;
202 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits; 200 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits;
203 ASSERT(zoom() == initialZoom()); 201 ASSERT(zoom() == initialZoom());
204 } 202 }
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 } 404 }
407 405
408 if (inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering 406 if (inherited_flags.m_rtlOrdering != other.inherited_flags.m_rtlOrdering
409 || inherited_flags._text_align != other.inherited_flags._text_align 407 || inherited_flags._text_align != other.inherited_flags._text_align
410 || inherited_flags._direction != other.inherited_flags._direction 408 || inherited_flags._direction != other.inherited_flags._direction
411 || inherited_flags._white_space != other.inherited_flags._white_space) 409 || inherited_flags._white_space != other.inherited_flags._white_space)
412 return true; 410 return true;
413 411
414 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX 412 if (noninherited_flags.overflowX != other.noninherited_flags.overflowX
415 || noninherited_flags.overflowY != other.noninherited_flags.overflowY 413 || noninherited_flags.overflowY != other.noninherited_flags.overflowY
416 || noninherited_flags.clear != other.noninherited_flags.clear
417 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid i 414 || noninherited_flags.unicodeBidi != other.noninherited_flags.unicodeBid i
418 || noninherited_flags.position != other.noninherited_flags.position 415 || noninherited_flags.position != other.noninherited_flags.position
419 || noninherited_flags.floating != other.noninherited_flags.floating
420 || noninherited_flags.originalDisplay != other.noninherited_flags.origin alDisplay) 416 || noninherited_flags.originalDisplay != other.noninherited_flags.origin alDisplay)
421 return true; 417 return true;
422 418
423 if (!m_background->outline().visuallyEqual(other.m_background->outline())) { 419 if (!m_background->outline().visuallyEqual(other.m_background->outline())) {
424 // FIXME: We only really need to recompute the overflow but we don't hav e an optimized layout for it. 420 // FIXME: We only really need to recompute the overflow but we don't hav e an optimized layout for it.
425 return true; 421 return true;
426 } 422 }
427 423
428 // Movement of non-static-positioned object is special cased in RenderStyle: :visualInvalidationDiff(). 424 // Movement of non-static-positioned object is special cased in RenderStyle: :visualInvalidationDiff().
429 425
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 // right 1377 // right
1382 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1378 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1383 if (radiiSum > rect.height()) 1379 if (radiiSum > rect.height())
1384 factor = std::min(rect.height() / radiiSum, factor); 1380 factor = std::min(rect.height() / radiiSum, factor);
1385 1381
1386 ASSERT(factor <= 1); 1382 ASSERT(factor <= 1);
1387 return factor; 1383 return factor;
1388 } 1384 }
1389 1385
1390 } // namespace blink 1386 } // 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