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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2699843002: Remove ComputedStyleBase::setBitsDefault(). (Closed)
Patch Set: Address comments Created 3 years, 10 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 | « third_party/WebKit/Source/core/style/ComputedStyle.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 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 : ComputedStyleBase(), 117 : ComputedStyleBase(),
118 RefCounted<ComputedStyle>(), 118 RefCounted<ComputedStyle>(),
119 m_box(initialStyle().m_box), 119 m_box(initialStyle().m_box),
120 m_visual(initialStyle().m_visual), 120 m_visual(initialStyle().m_visual),
121 m_background(initialStyle().m_background), 121 m_background(initialStyle().m_background),
122 m_surround(initialStyle().m_surround), 122 m_surround(initialStyle().m_surround),
123 m_rareNonInheritedData(initialStyle().m_rareNonInheritedData), 123 m_rareNonInheritedData(initialStyle().m_rareNonInheritedData),
124 m_rareInheritedData(initialStyle().m_rareInheritedData), 124 m_rareInheritedData(initialStyle().m_rareInheritedData),
125 m_styleInheritedData(initialStyle().m_styleInheritedData), 125 m_styleInheritedData(initialStyle().m_styleInheritedData),
126 m_svgStyle(initialStyle().m_svgStyle) { 126 m_svgStyle(initialStyle().m_svgStyle) {
127 setBitDefaults(); // Would it be faster to copy this from the default style? 127 initializeBitDefaults(); // Would it be faster to copy this from the default
128 // style?
128 static_assert((sizeof(InheritedData) <= 8), "InheritedData should not grow"); 129 static_assert((sizeof(InheritedData) <= 8), "InheritedData should not grow");
129 static_assert((sizeof(NonInheritedData) <= 12), 130 static_assert((sizeof(NonInheritedData) <= 12),
130 "NonInheritedData should not grow"); 131 "NonInheritedData should not grow");
131 } 132 }
132 133
133 ALWAYS_INLINE ComputedStyle::ComputedStyle(InitialStyleTag) 134 ALWAYS_INLINE ComputedStyle::ComputedStyle(InitialStyleTag)
134 : ComputedStyleBase(), RefCounted<ComputedStyle>() { 135 : ComputedStyleBase(), RefCounted<ComputedStyle>() {
135 setBitDefaults(); 136 initializeBitDefaults();
136 137
137 m_box.init(); 138 m_box.init();
138 m_visual.init(); 139 m_visual.init();
139 m_background.init(); 140 m_background.init();
140 m_surround.init(); 141 m_surround.init();
141 m_rareNonInheritedData.init(); 142 m_rareNonInheritedData.init();
142 m_rareNonInheritedData.access()->m_deprecatedFlexibleBox.init(); 143 m_rareNonInheritedData.access()->m_deprecatedFlexibleBox.init();
143 m_rareNonInheritedData.access()->m_flexibleBox.init(); 144 m_rareNonInheritedData.access()->m_flexibleBox.init();
144 m_rareNonInheritedData.access()->m_multiCol.init(); 145 m_rareNonInheritedData.access()->m_multiCol.init();
145 m_rareNonInheritedData.access()->m_transform.init(); 146 m_rareNonInheritedData.access()->m_transform.init();
(...skipping 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after
2470 if (value < 0) 2471 if (value < 0)
2471 fvalue -= 0.5f; 2472 fvalue -= 0.5f;
2472 else 2473 else
2473 fvalue += 0.5f; 2474 fvalue += 0.5f;
2474 } 2475 }
2475 2476
2476 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2477 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2477 } 2478 }
2478 2479
2479 } // namespace blink 2480 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698