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

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

Issue 639293008: Make CSS resize property non-inherited. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: New baselines Created 6 years, 2 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/rendering/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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 , m_objectFit(RenderStyle::initialObjectFit()) 83 , m_objectFit(RenderStyle::initialObjectFit())
84 , m_isolation(RenderStyle::initialIsolation()) 84 , m_isolation(RenderStyle::initialIsolation())
85 , m_justifyItems(RenderStyle::initialJustifyItems()) 85 , m_justifyItems(RenderStyle::initialJustifyItems())
86 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl ignment()) 86 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl ignment())
87 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType()) 87 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType())
88 , m_justifySelf(RenderStyle::initialJustifySelf()) 88 , m_justifySelf(RenderStyle::initialJustifySelf())
89 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment()) 89 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment())
90 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) 90 , m_scrollBehavior(RenderStyle::initialScrollBehavior())
91 , m_requiresAcceleratedCompositingForExternalReasons(false) 91 , m_requiresAcceleratedCompositingForExternalReasons(false)
92 , m_hasInlineTransform(false) 92 , m_hasInlineTransform(false)
93 , m_resize(RenderStyle::initialResize())
93 { 94 {
94 m_maskBoxImage.setMaskDefaults(); 95 m_maskBoxImage.setMaskDefaults();
95 } 96 }
96 97
97 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 98 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
98 : RefCounted<StyleRareNonInheritedData>() 99 : RefCounted<StyleRareNonInheritedData>()
99 , opacity(o.opacity) 100 , opacity(o.opacity)
100 , m_perspective(o.m_perspective) 101 , m_perspective(o.m_perspective)
101 , m_perspectiveOrigin(o.m_perspectiveOrigin) 102 , m_perspectiveOrigin(o.m_perspectiveOrigin)
102 , lineClamp(o.lineClamp) 103 , lineClamp(o.lineClamp)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 , m_objectFit(o.m_objectFit) 163 , m_objectFit(o.m_objectFit)
163 , m_isolation(o.m_isolation) 164 , m_isolation(o.m_isolation)
164 , m_justifyItems(o.m_justifyItems) 165 , m_justifyItems(o.m_justifyItems)
165 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) 166 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment)
166 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) 167 , m_justifyItemsPositionType(o.m_justifyItemsPositionType)
167 , m_justifySelf(o.m_justifySelf) 168 , m_justifySelf(o.m_justifySelf)
168 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) 169 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
169 , m_scrollBehavior(o.m_scrollBehavior) 170 , m_scrollBehavior(o.m_scrollBehavior)
170 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 171 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
171 , m_hasInlineTransform(o.m_hasInlineTransform) 172 , m_hasInlineTransform(o.m_hasInlineTransform)
173 , m_resize(o.m_resize)
172 { 174 {
173 } 175 }
174 176
175 StyleRareNonInheritedData::~StyleRareNonInheritedData() 177 StyleRareNonInheritedData::~StyleRareNonInheritedData()
176 { 178 {
177 const FilterOperations& filterOperations = m_filter->m_operations; 179 const FilterOperations& filterOperations = m_filter->m_operations;
178 for (unsigned i = 0; i < filterOperations.size(); ++i) 180 for (unsigned i = 0; i < filterOperations.size(); ++i)
179 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i)); 181 ReferenceFilterBuilder::clearDocumentResourceReference(filterOperations. at(i));
180 } 182 }
181 183
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 && m_touchAction == o.m_touchAction 246 && m_touchAction == o.m_touchAction
245 && m_objectFit == o.m_objectFit 247 && m_objectFit == o.m_objectFit
246 && m_isolation == o.m_isolation 248 && m_isolation == o.m_isolation
247 && m_justifyItems == o.m_justifyItems 249 && m_justifyItems == o.m_justifyItems
248 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment 250 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment
249 && m_justifyItemsPositionType == o.m_justifyItemsPositionType 251 && m_justifyItemsPositionType == o.m_justifyItemsPositionType
250 && m_justifySelf == o.m_justifySelf 252 && m_justifySelf == o.m_justifySelf
251 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment 253 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment
252 && m_scrollBehavior == o.m_scrollBehavior 254 && m_scrollBehavior == o.m_scrollBehavior
253 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons 255 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons
254 && m_hasInlineTransform == o.m_hasInlineTransform; 256 && m_hasInlineTransform == o.m_hasInlineTransform
257 && m_resize == o.m_resize;
255 } 258 }
256 259
257 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 260 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
258 { 261 {
259 ContentData* a = m_content.get(); 262 ContentData* a = m_content.get();
260 ContentData* b = o.m_content.get(); 263 ContentData* b = o.m_content.get();
261 264
262 while (a && b && *a == *b) { 265 while (a && b && *a == *b) {
263 a = a->next(); 266 a = a->next();
264 b = b->next(); 267 b = b->next();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 return false; 302 return false;
300 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 303 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
301 } 304 }
302 305
303 bool StyleRareNonInheritedData::hasFilters() const 306 bool StyleRareNonInheritedData::hasFilters() const
304 { 307 {
305 return m_filter.get() && !m_filter->m_operations.isEmpty(); 308 return m_filter.get() && !m_filter->m_operations.isEmpty();
306 } 309 }
307 310
308 } // namespace blink 311 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698