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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 547273002: Make currentColor behave the same internally as initial (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 | « Source/core/rendering/style/RenderStyle.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 * 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign; 226 noninherited_flags.verticalAlign = other->noninherited_flags.verticalAlign;
227 noninherited_flags.clear = other->noninherited_flags.clear; 227 noninherited_flags.clear = other->noninherited_flags.clear;
228 noninherited_flags.position = other->noninherited_flags.position; 228 noninherited_flags.position = other->noninherited_flags.position;
229 noninherited_flags.floating = other->noninherited_flags.floating; 229 noninherited_flags.floating = other->noninherited_flags.floating;
230 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout; 230 noninherited_flags.tableLayout = other->noninherited_flags.tableLayout;
231 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi; 231 noninherited_flags.unicodeBidi = other->noninherited_flags.unicodeBidi;
232 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo re; 232 noninherited_flags.pageBreakBefore = other->noninherited_flags.pageBreakBefo re;
233 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter ; 233 noninherited_flags.pageBreakAfter = other->noninherited_flags.pageBreakAfter ;
234 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi de; 234 noninherited_flags.pageBreakInside = other->noninherited_flags.pageBreakInsi de;
235 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance; 235 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance;
236 noninherited_flags.currentColor = other->noninherited_flags.currentColor;
237 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits; 236 noninherited_flags.hasViewportUnits = other->noninherited_flags.hasViewportU nits;
238 if (m_svgStyle != other->m_svgStyle) 237 if (m_svgStyle != other->m_svgStyle)
239 m_svgStyle.access()->copyNonInheritedFrom(other->m_svgStyle.get()); 238 m_svgStyle.access()->copyNonInheritedFrom(other->m_svgStyle.get());
240 ASSERT(zoom() == initialZoom()); 239 ASSERT(zoom() == initialZoom());
241 } 240 }
242 241
243 bool RenderStyle::operator==(const RenderStyle& o) const 242 bool RenderStyle::operator==(const RenderStyle& o) const
244 { 243 {
245 // compare everything except the pseudoStyle pointer 244 // compare everything except the pseudoStyle pointer
246 return inherited_flags == o.inherited_flags 245 return inherited_flags == o.inherited_flags
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1690 // right 1689 // right
1691 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1690 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1692 if (radiiSum > rect.height()) 1691 if (radiiSum > rect.height())
1693 factor = std::min(rect.height() / radiiSum, factor); 1692 factor = std::min(rect.height() / radiiSum, factor);
1694 1693
1695 ASSERT(factor <= 1); 1694 ASSERT(factor <= 1);
1696 return factor; 1695 return factor;
1697 } 1696 }
1698 1697
1699 } // namespace blink 1698 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698