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

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

Issue 1251523003: Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update comment Created 5 years, 3 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 , m_effectiveBlendMode(ComputedStyle::initialBlendMode()) 115 , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
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_scrollSnapType(ComputedStyle::initialScrollSnapType()) 120 , m_scrollSnapType(ComputedStyle::initialScrollSnapType())
121 , m_requiresAcceleratedCompositingForExternalReasons(false) 121 , m_requiresAcceleratedCompositingForExternalReasons(false)
122 , m_hasInlineTransform(false) 122 , m_hasInlineTransform(false)
123 , m_resize(ComputedStyle::initialResize()) 123 , m_resize(ComputedStyle::initialResize())
124 , m_hasCompositorProxy(false) 124 , m_hasCompositorProxy(false)
125 , m_hasAuthorBackground(false)
126 , m_hasAuthorBorder(false)
125 { 127 {
126 m_maskBoxImage.setMaskDefaults(); 128 m_maskBoxImage.setMaskDefaults();
127 } 129 }
128 130
129 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 131 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
130 : RefCounted<StyleRareNonInheritedData>() 132 : RefCounted<StyleRareNonInheritedData>()
131 , opacity(o.opacity) 133 , opacity(o.opacity)
132 , m_perspective(o.m_perspective) 134 , m_perspective(o.m_perspective)
133 , m_shapeImageThreshold(o.m_shapeImageThreshold) 135 , m_shapeImageThreshold(o.m_shapeImageThreshold)
134 , m_order(o.m_order) 136 , m_order(o.m_order)
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 , m_effectiveBlendMode(o.m_effectiveBlendMode) 193 , m_effectiveBlendMode(o.m_effectiveBlendMode)
192 , m_touchAction(o.m_touchAction) 194 , m_touchAction(o.m_touchAction)
193 , m_objectFit(o.m_objectFit) 195 , m_objectFit(o.m_objectFit)
194 , m_isolation(o.m_isolation) 196 , m_isolation(o.m_isolation)
195 , m_scrollBehavior(o.m_scrollBehavior) 197 , m_scrollBehavior(o.m_scrollBehavior)
196 , m_scrollSnapType(o.m_scrollSnapType) 198 , m_scrollSnapType(o.m_scrollSnapType)
197 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 199 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
198 , m_hasInlineTransform(o.m_hasInlineTransform) 200 , m_hasInlineTransform(o.m_hasInlineTransform)
199 , m_resize(o.m_resize) 201 , m_resize(o.m_resize)
200 , m_hasCompositorProxy(o.m_hasCompositorProxy) 202 , m_hasCompositorProxy(o.m_hasCompositorProxy)
203 , m_hasAuthorBackground(o.m_hasAuthorBackground)
204 , m_hasAuthorBorder(o.m_hasAuthorBorder)
201 { 205 {
202 } 206 }
203 207
204 StyleRareNonInheritedData::~StyleRareNonInheritedData() 208 StyleRareNonInheritedData::~StyleRareNonInheritedData()
205 { 209 {
206 const FilterOperations& filterOperations = m_filter->m_operations; 210 const FilterOperations& filterOperations = m_filter->m_operations;
207 for (unsigned i = 0; i < filterOperations.size(); ++i) 211 for (unsigned i = 0; i < filterOperations.size(); ++i)
208 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i)); 212 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i));
209 } 213 }
210 214
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 274 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
271 && m_effectiveBlendMode == o.m_effectiveBlendMode 275 && m_effectiveBlendMode == o.m_effectiveBlendMode
272 && m_touchAction == o.m_touchAction 276 && m_touchAction == o.m_touchAction
273 && m_objectFit == o.m_objectFit 277 && m_objectFit == o.m_objectFit
274 && m_isolation == o.m_isolation 278 && m_isolation == o.m_isolation
275 && m_scrollBehavior == o.m_scrollBehavior 279 && m_scrollBehavior == o.m_scrollBehavior
276 && m_scrollSnapType == o.m_scrollSnapType 280 && m_scrollSnapType == o.m_scrollSnapType
277 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons 281 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons
278 && m_hasInlineTransform == o.m_hasInlineTransform 282 && m_hasInlineTransform == o.m_hasInlineTransform
279 && m_resize == o.m_resize 283 && m_resize == o.m_resize
280 && m_hasCompositorProxy == o.m_hasCompositorProxy; 284 && m_hasCompositorProxy == o.m_hasCompositorProxy
285 && m_hasAuthorBackground == o.m_hasAuthorBackground
286 && m_hasAuthorBorder == o.m_hasAuthorBorder;
281 } 287 }
282 288
283 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 289 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
284 { 290 {
285 ContentData* a = m_content.get(); 291 ContentData* a = m_content.get();
286 ContentData* b = o.m_content.get(); 292 ContentData* b = o.m_content.get();
287 293
288 while (a && b && *a == *b) { 294 while (a && b && *a == *b) {
289 a = a->next(); 295 a = a->next();
290 b = b->next(); 296 b = b->next();
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 { 341 {
336 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 342 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
337 } 343 }
338 344
339 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 345 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
340 { 346 {
341 return dataEquivalent(m_clipPath, o.m_clipPath); 347 return dataEquivalent(m_clipPath, o.m_clipPath);
342 } 348 }
343 349
344 } // namespace blink 350 } // 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