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

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

Issue 18859010: Move colorFromPrimitiveValue from StyleResolverState to TextLinkColors (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 noninherited_flags._vertical_align = other->noninherited_flags._vertical_ali gn; 181 noninherited_flags._vertical_align = other->noninherited_flags._vertical_ali gn;
182 noninherited_flags._clear = other->noninherited_flags._clear; 182 noninherited_flags._clear = other->noninherited_flags._clear;
183 noninherited_flags._position = other->noninherited_flags._position; 183 noninherited_flags._position = other->noninherited_flags._position;
184 noninherited_flags._floating = other->noninherited_flags._floating; 184 noninherited_flags._floating = other->noninherited_flags._floating;
185 noninherited_flags._table_layout = other->noninherited_flags._table_layout; 185 noninherited_flags._table_layout = other->noninherited_flags._table_layout;
186 noninherited_flags._unicodeBidi = other->noninherited_flags._unicodeBidi; 186 noninherited_flags._unicodeBidi = other->noninherited_flags._unicodeBidi;
187 noninherited_flags._page_break_before = other->noninherited_flags._page_brea k_before; 187 noninherited_flags._page_break_before = other->noninherited_flags._page_brea k_before;
188 noninherited_flags._page_break_after = other->noninherited_flags._page_break _after; 188 noninherited_flags._page_break_after = other->noninherited_flags._page_break _after;
189 noninherited_flags._page_break_inside = other->noninherited_flags._page_brea k_inside; 189 noninherited_flags._page_break_inside = other->noninherited_flags._page_brea k_inside;
190 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance; 190 noninherited_flags.explicitInheritance = other->noninherited_flags.explicitI nheritance;
191 noninherited_flags.currentColor = other->noninherited_flags.currentColor;
191 if (m_svgStyle != other->m_svgStyle) 192 if (m_svgStyle != other->m_svgStyle)
192 m_svgStyle.access()->copyNonInheritedFrom(other->m_svgStyle.get()); 193 m_svgStyle.access()->copyNonInheritedFrom(other->m_svgStyle.get());
193 ASSERT(zoom() == initialZoom()); 194 ASSERT(zoom() == initialZoom());
194 } 195 }
195 196
196 bool RenderStyle::operator==(const RenderStyle& o) const 197 bool RenderStyle::operator==(const RenderStyle& o) const
197 { 198 {
198 // compare everything except the pseudoStyle pointer 199 // compare everything except the pseudoStyle pointer
199 return inherited_flags == o.inherited_flags 200 return inherited_flags == o.inherited_flags
200 && noninherited_flags == o.noninherited_flags 201 && noninherited_flags == o.noninherited_flags
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1572 info.addMember(rareInheritedData, "rareInheritedData"); 1573 info.addMember(rareInheritedData, "rareInheritedData");
1573 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented. 1574 // FIXME: inherited contains StyleImage and Font fields that might need to b e instrumented.
1574 info.addMember(inherited, "inherited"); 1575 info.addMember(inherited, "inherited");
1575 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); 1576 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
1576 info.addMember(m_svgStyle, "svgStyle"); 1577 info.addMember(m_svgStyle, "svgStyle");
1577 info.addMember(inherited_flags, "inherited_flags"); 1578 info.addMember(inherited_flags, "inherited_flags");
1578 info.addMember(noninherited_flags, "noninherited_flags"); 1579 info.addMember(noninherited_flags, "noninherited_flags");
1579 } 1580 }
1580 1581
1581 } // namespace WebCore 1582 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/scripts/templates/StyleBuilderFunctions.cpp.tmpl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698