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

Side by Side Diff: Source/core/style/StyleRareNonInheritedData.cpp

Issue 1274263003: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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/style/StyleRareNonInheritedData.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 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 , m_touchAction(ComputedStyle::initialTouchAction()) 116 , m_touchAction(ComputedStyle::initialTouchAction())
117 , m_objectFit(ComputedStyle::initialObjectFit()) 117 , m_objectFit(ComputedStyle::initialObjectFit())
118 , m_isolation(ComputedStyle::initialIsolation()) 118 , m_isolation(ComputedStyle::initialIsolation())
119 , m_scrollBehavior(ComputedStyle::initialScrollBehavior()) 119 , m_scrollBehavior(ComputedStyle::initialScrollBehavior())
120 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn()) 120 , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
121 , m_scrollSnapType(ComputedStyle::initialScrollSnapType()) 121 , m_scrollSnapType(ComputedStyle::initialScrollSnapType())
122 , m_requiresAcceleratedCompositingForExternalReasons(false) 122 , m_requiresAcceleratedCompositingForExternalReasons(false)
123 , m_hasInlineTransform(false) 123 , m_hasInlineTransform(false)
124 , m_resize(ComputedStyle::initialResize()) 124 , m_resize(ComputedStyle::initialResize())
125 , m_hasCompositorProxy(false) 125 , m_hasCompositorProxy(false)
126 , m_hasAuthorBackground(false)
127 , m_hasAuthorBorder(false)
128 { 126 {
129 m_maskBoxImage.setMaskDefaults(); 127 m_maskBoxImage.setMaskDefaults();
130 } 128 }
131 129
132 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 130 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
133 : RefCounted<StyleRareNonInheritedData>() 131 : RefCounted<StyleRareNonInheritedData>()
134 , opacity(o.opacity) 132 , opacity(o.opacity)
135 , m_perspective(o.m_perspective) 133 , m_perspective(o.m_perspective)
136 , m_shapeImageThreshold(o.m_shapeImageThreshold) 134 , m_shapeImageThreshold(o.m_shapeImageThreshold)
137 , m_order(o.m_order) 135 , m_order(o.m_order)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 , m_touchAction(o.m_touchAction) 193 , m_touchAction(o.m_touchAction)
196 , m_objectFit(o.m_objectFit) 194 , m_objectFit(o.m_objectFit)
197 , m_isolation(o.m_isolation) 195 , m_isolation(o.m_isolation)
198 , m_scrollBehavior(o.m_scrollBehavior) 196 , m_scrollBehavior(o.m_scrollBehavior)
199 , m_scrollBlocksOn(o.m_scrollBlocksOn) 197 , m_scrollBlocksOn(o.m_scrollBlocksOn)
200 , m_scrollSnapType(o.m_scrollSnapType) 198 , m_scrollSnapType(o.m_scrollSnapType)
201 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 199 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
202 , m_hasInlineTransform(o.m_hasInlineTransform) 200 , m_hasInlineTransform(o.m_hasInlineTransform)
203 , m_resize(o.m_resize) 201 , m_resize(o.m_resize)
204 , m_hasCompositorProxy(o.m_hasCompositorProxy) 202 , m_hasCompositorProxy(o.m_hasCompositorProxy)
205 , m_hasAuthorBackground(o.m_hasAuthorBackground)
206 , m_hasAuthorBorder(o.m_hasAuthorBorder)
207 { 203 {
208 } 204 }
209 205
210 StyleRareNonInheritedData::~StyleRareNonInheritedData() 206 StyleRareNonInheritedData::~StyleRareNonInheritedData()
211 { 207 {
212 const FilterOperations& filterOperations = m_filter->m_operations; 208 const FilterOperations& filterOperations = m_filter->m_operations;
213 for (unsigned i = 0; i < filterOperations.size(); ++i) 209 for (unsigned i = 0; i < filterOperations.size(); ++i)
214 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i)); 210 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i));
215 } 211 }
216 212
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 && m_effectiveBlendMode == o.m_effectiveBlendMode 273 && m_effectiveBlendMode == o.m_effectiveBlendMode
278 && m_touchAction == o.m_touchAction 274 && m_touchAction == o.m_touchAction
279 && m_objectFit == o.m_objectFit 275 && m_objectFit == o.m_objectFit
280 && m_isolation == o.m_isolation 276 && m_isolation == o.m_isolation
281 && m_scrollBehavior == o.m_scrollBehavior 277 && m_scrollBehavior == o.m_scrollBehavior
282 && m_scrollBlocksOn == o.m_scrollBlocksOn 278 && m_scrollBlocksOn == o.m_scrollBlocksOn
283 && m_scrollBlocksOn == o.m_scrollSnapType 279 && m_scrollBlocksOn == o.m_scrollSnapType
284 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons 280 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons
285 && m_hasInlineTransform == o.m_hasInlineTransform 281 && m_hasInlineTransform == o.m_hasInlineTransform
286 && m_resize == o.m_resize 282 && m_resize == o.m_resize
287 && m_hasCompositorProxy == o.m_hasCompositorProxy 283 && m_hasCompositorProxy == o.m_hasCompositorProxy;
288 && m_hasAuthorBackground == o.m_hasAuthorBackground
289 && m_hasAuthorBorder == o.m_hasAuthorBorder;
290 } 284 }
291 285
292 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 286 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
293 { 287 {
294 ContentData* a = m_content.get(); 288 ContentData* a = m_content.get();
295 ContentData* b = o.m_content.get(); 289 ContentData* b = o.m_content.get();
296 290
297 while (a && b && *a == *b) { 291 while (a && b && *a == *b) {
298 a = a->next(); 292 a = a->next();
299 b = b->next(); 293 b = b->next();
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 { 338 {
345 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 339 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
346 } 340 }
347 341
348 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 342 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
349 { 343 {
350 return dataEquivalent(m_clipPath, o.m_clipPath); 344 return dataEquivalent(m_clipPath, o.m_clipPath);
351 } 345 }
352 346
353 } // namespace blink 347 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698