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

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

Issue 2672703002: Generate nonproperty 'explicitInheritance' in ComputedStyleBase. (Closed)
Patch Set: Size check Created 3 years, 9 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 void* dataRefs[7]; 78 void* dataRefs[7];
79 void* ownPtrs[1]; 79 void* ownPtrs[1];
80 void* dataRefSvgStyle; 80 void* dataRefSvgStyle;
81 81
82 struct InheritedData { 82 struct InheritedData {
83 unsigned m_bitfields[1]; 83 unsigned m_bitfields[1];
84 } m_inheritedData; 84 } m_inheritedData;
85 85
86 struct NonInheritedData { 86 struct NonInheritedData {
87 unsigned m_bitfields[2]; 87 unsigned m_bitfields[1];
88 } m_nonInheritedData; 88 } m_nonInheritedData;
89 }; 89 };
90 90
91 // If this assert fails, it means that size of ComputedStyle has changed. Please 91 // If this assert fails, it means that size of ComputedStyle has changed. Please
92 // check that you really *do* what to increase the size of ComputedStyle, then 92 // check that you really *do* what to increase the size of ComputedStyle, then
93 // update the SameSizeAsComputedStyle struct to match the updated storage of 93 // update the SameSizeAsComputedStyle struct to match the updated storage of
94 // ComputedStyle. 94 // ComputedStyle.
95 ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle); 95 ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle);
96 96
97 PassRefPtr<ComputedStyle> ComputedStyle::create() { 97 PassRefPtr<ComputedStyle> ComputedStyle::create() {
(...skipping 2400 matching lines...) Expand 10 before | Expand all | Expand 10 after
2498 if (value < 0) 2498 if (value < 0)
2499 fvalue -= 0.5f; 2499 fvalue -= 0.5f;
2500 else 2500 else
2501 fvalue += 0.5f; 2501 fvalue += 0.5f;
2502 } 2502 }
2503 2503
2504 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2504 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2505 } 2505 }
2506 2506
2507 } // namespace blink 2507 } // 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