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

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

Issue 8390051: Merge 98492 - REGRESSION (r94887): Scrolling the HTML spec is more jerky now than it was (regress... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 return adoptRef(new RenderStyle(*other)); 73 return adoptRef(new RenderStyle(*other));
74 } 74 }
75 75
76 ALWAYS_INLINE RenderStyle::RenderStyle() 76 ALWAYS_INLINE RenderStyle::RenderStyle()
77 : m_affectedByUncommonAttributeSelectors(false) 77 : m_affectedByUncommonAttributeSelectors(false)
78 , m_unique(false) 78 , m_unique(false)
79 , m_affectedByEmpty(false) 79 , m_affectedByEmpty(false)
80 , m_emptyState(false) 80 , m_emptyState(false)
81 , m_childrenAffectedByFirstChildRules(false) 81 , m_childrenAffectedByFirstChildRules(false)
82 , m_childrenAffectedByLastChildRules(false) 82 , m_childrenAffectedByLastChildRules(false)
83 , m_childrenAffectedByDirectAdjacentRules(false)
83 , m_childrenAffectedByForwardPositionalRules(false) 84 , m_childrenAffectedByForwardPositionalRules(false)
84 , m_childrenAffectedByBackwardPositionalRules(false) 85 , m_childrenAffectedByBackwardPositionalRules(false)
85 , m_firstChildState(false) 86 , m_firstChildState(false)
86 , m_lastChildState(false) 87 , m_lastChildState(false)
87 , m_affectedByDirectAdjacentRules(false)
88 , m_childIndex(0) 88 , m_childIndex(0)
89 , m_box(defaultStyle()->m_box) 89 , m_box(defaultStyle()->m_box)
90 , visual(defaultStyle()->visual) 90 , visual(defaultStyle()->visual)
91 , m_background(defaultStyle()->m_background) 91 , m_background(defaultStyle()->m_background)
92 , surround(defaultStyle()->surround) 92 , surround(defaultStyle()->surround)
93 , rareNonInheritedData(defaultStyle()->rareNonInheritedData) 93 , rareNonInheritedData(defaultStyle()->rareNonInheritedData)
94 , rareInheritedData(defaultStyle()->rareInheritedData) 94 , rareInheritedData(defaultStyle()->rareInheritedData)
95 , inherited(defaultStyle()->inherited) 95 , inherited(defaultStyle()->inherited)
96 #if ENABLE(SVG) 96 #if ENABLE(SVG)
97 , m_svgStyle(defaultStyle()->m_svgStyle) 97 , m_svgStyle(defaultStyle()->m_svgStyle)
98 #endif 98 #endif
99 { 99 {
100 setBitDefaults(); // Would it be faster to copy this from the default style? 100 setBitDefaults(); // Would it be faster to copy this from the default style?
101 } 101 }
102 102
103 ALWAYS_INLINE RenderStyle::RenderStyle(bool) 103 ALWAYS_INLINE RenderStyle::RenderStyle(bool)
104 : m_affectedByUncommonAttributeSelectors(false) 104 : m_affectedByUncommonAttributeSelectors(false)
105 , m_unique(false) 105 , m_unique(false)
106 , m_affectedByEmpty(false) 106 , m_affectedByEmpty(false)
107 , m_emptyState(false) 107 , m_emptyState(false)
108 , m_childrenAffectedByFirstChildRules(false) 108 , m_childrenAffectedByFirstChildRules(false)
109 , m_childrenAffectedByLastChildRules(false) 109 , m_childrenAffectedByLastChildRules(false)
110 , m_childrenAffectedByDirectAdjacentRules(false)
110 , m_childrenAffectedByForwardPositionalRules(false) 111 , m_childrenAffectedByForwardPositionalRules(false)
111 , m_childrenAffectedByBackwardPositionalRules(false) 112 , m_childrenAffectedByBackwardPositionalRules(false)
112 , m_firstChildState(false) 113 , m_firstChildState(false)
113 , m_lastChildState(false) 114 , m_lastChildState(false)
114 , m_affectedByDirectAdjacentRules(false)
115 , m_childIndex(0) 115 , m_childIndex(0)
116 { 116 {
117 setBitDefaults(); 117 setBitDefaults();
118 118
119 m_box.init(); 119 m_box.init();
120 visual.init(); 120 visual.init();
121 m_background.init(); 121 m_background.init();
122 surround.init(); 122 surround.init();
123 rareNonInheritedData.init(); 123 rareNonInheritedData.init();
124 rareNonInheritedData.access()->m_deprecatedFlexibleBox.init(); 124 rareNonInheritedData.access()->m_deprecatedFlexibleBox.init();
(...skipping 15 matching lines...) Expand all
140 } 140 }
141 141
142 ALWAYS_INLINE RenderStyle::RenderStyle(const RenderStyle& o) 142 ALWAYS_INLINE RenderStyle::RenderStyle(const RenderStyle& o)
143 : RefCounted<RenderStyle>() 143 : RefCounted<RenderStyle>()
144 , m_affectedByUncommonAttributeSelectors(false) 144 , m_affectedByUncommonAttributeSelectors(false)
145 , m_unique(false) 145 , m_unique(false)
146 , m_affectedByEmpty(false) 146 , m_affectedByEmpty(false)
147 , m_emptyState(false) 147 , m_emptyState(false)
148 , m_childrenAffectedByFirstChildRules(false) 148 , m_childrenAffectedByFirstChildRules(false)
149 , m_childrenAffectedByLastChildRules(false) 149 , m_childrenAffectedByLastChildRules(false)
150 , m_childrenAffectedByDirectAdjacentRules(false)
150 , m_childrenAffectedByForwardPositionalRules(false) 151 , m_childrenAffectedByForwardPositionalRules(false)
151 , m_childrenAffectedByBackwardPositionalRules(false) 152 , m_childrenAffectedByBackwardPositionalRules(false)
152 , m_firstChildState(false) 153 , m_firstChildState(false)
153 , m_lastChildState(false) 154 , m_lastChildState(false)
154 , m_affectedByDirectAdjacentRules(false)
155 , m_childIndex(0) 155 , m_childIndex(0)
156 , m_box(o.m_box) 156 , m_box(o.m_box)
157 , visual(o.visual) 157 , visual(o.visual)
158 , m_background(o.m_background) 158 , m_background(o.m_background)
159 , surround(o.surround) 159 , surround(o.surround)
160 , rareNonInheritedData(o.rareNonInheritedData) 160 , rareNonInheritedData(o.rareNonInheritedData)
161 , rareInheritedData(o.rareInheritedData) 161 , rareInheritedData(o.rareInheritedData)
162 , inherited(o.inherited) 162 , inherited(o.inherited)
163 #if ENABLE(SVG) 163 #if ENABLE(SVG)
164 , m_svgStyle(o.m_svgStyle) 164 , m_svgStyle(o.m_svgStyle)
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 left = NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth( )); 1528 left = NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth( ));
1529 } 1529 }
1530 1530
1531 void RenderStyle::getImageVerticalOutsets(const NinePieceImage& image, LayoutUni t& top, LayoutUnit& bottom) const 1531 void RenderStyle::getImageVerticalOutsets(const NinePieceImage& image, LayoutUni t& top, LayoutUnit& bottom) const
1532 { 1532 {
1533 top = NinePieceImage::computeOutset(image.outset().top(), borderTopWidth()); 1533 top = NinePieceImage::computeOutset(image.outset().top(), borderTopWidth());
1534 bottom = NinePieceImage::computeOutset(image.outset().bottom(), borderBottom Width()); 1534 bottom = NinePieceImage::computeOutset(image.outset().bottom(), borderBottom Width());
1535 } 1535 }
1536 1536
1537 } // namespace WebCore 1537 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698