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

Side by Side Diff: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 | « sky/engine/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 23 matching lines...) Expand all
34 StyleRareNonInheritedData::StyleRareNonInheritedData() 34 StyleRareNonInheritedData::StyleRareNonInheritedData()
35 : opacity(RenderStyle::initialOpacity()) 35 : opacity(RenderStyle::initialOpacity())
36 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator()) 36 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
37 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator()) 37 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
38 , m_perspective(RenderStyle::initialPerspective()) 38 , m_perspective(RenderStyle::initialPerspective())
39 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) 39 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
40 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) 40 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
41 , lineClamp(RenderStyle::initialLineClamp()) 41 , lineClamp(RenderStyle::initialLineClamp())
42 , m_mask(MaskFillLayer, true) 42 , m_mask(MaskFillLayer, true)
43 , m_pageSize() 43 , m_pageSize()
44 , m_shapeOutside(RenderStyle::initialShapeOutside())
45 , m_shapeMargin(RenderStyle::initialShapeMargin())
46 , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
47 , m_clipPath(RenderStyle::initialClipPath()) 44 , m_clipPath(RenderStyle::initialClipPath())
48 , m_textDecorationColor(StyleColor::currentColor()) 45 , m_textDecorationColor(StyleColor::currentColor())
49 , m_order(RenderStyle::initialOrder()) 46 , m_order(RenderStyle::initialOrder())
50 , m_objectPosition(RenderStyle::initialObjectPosition()) 47 , m_objectPosition(RenderStyle::initialObjectPosition())
51 , m_pageSizeType(PAGE_SIZE_AUTO) 48 , m_pageSizeType(PAGE_SIZE_AUTO)
52 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 49 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
53 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 50 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
54 , m_alignContent(RenderStyle::initialAlignContent()) 51 , m_alignContent(RenderStyle::initialAlignContent())
55 , m_alignItems(RenderStyle::initialAlignItems()) 52 , m_alignItems(RenderStyle::initialAlignItems())
56 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 53 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 , m_willChange(o.m_willChange) 98 , m_willChange(o.m_willChange)
102 , m_filter(o.m_filter) 99 , m_filter(o.m_filter)
103 , m_content(o.m_content ? o.m_content->clone() : nullptr) 100 , m_content(o.m_content ? o.m_content->clone() : nullptr)
104 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 101 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
105 , m_boxShadow(o.m_boxShadow) 102 , m_boxShadow(o.m_boxShadow)
106 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr) 103 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
107 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr) 104 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr)
108 , m_mask(o.m_mask) 105 , m_mask(o.m_mask)
109 , m_maskBoxImage(o.m_maskBoxImage) 106 , m_maskBoxImage(o.m_maskBoxImage)
110 , m_pageSize(o.m_pageSize) 107 , m_pageSize(o.m_pageSize)
111 , m_shapeOutside(o.m_shapeOutside)
112 , m_shapeMargin(o.m_shapeMargin)
113 , m_shapeImageThreshold(o.m_shapeImageThreshold)
114 , m_clipPath(o.m_clipPath) 108 , m_clipPath(o.m_clipPath)
115 , m_textDecorationColor(o.m_textDecorationColor) 109 , m_textDecorationColor(o.m_textDecorationColor)
116 , m_order(o.m_order) 110 , m_order(o.m_order)
117 , m_objectPosition(o.m_objectPosition) 111 , m_objectPosition(o.m_objectPosition)
118 , m_pageSizeType(o.m_pageSizeType) 112 , m_pageSizeType(o.m_pageSizeType)
119 , m_transformStyle3D(o.m_transformStyle3D) 113 , m_transformStyle3D(o.m_transformStyle3D)
120 , m_backfaceVisibility(o.m_backfaceVisibility) 114 , m_backfaceVisibility(o.m_backfaceVisibility)
121 , m_alignContent(o.m_alignContent) 115 , m_alignContent(o.m_alignContent)
122 , m_alignItems(o.m_alignItems) 116 , m_alignItems(o.m_alignItems)
123 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 117 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 && m_willChange == o.m_willChange 165 && m_willChange == o.m_willChange
172 && m_filter == o.m_filter 166 && m_filter == o.m_filter
173 && contentDataEquivalent(o) 167 && contentDataEquivalent(o)
174 && counterDataEquivalent(o) 168 && counterDataEquivalent(o)
175 && shadowDataEquivalent(o) 169 && shadowDataEquivalent(o)
176 && animationDataEquivalent(o) 170 && animationDataEquivalent(o)
177 && transitionDataEquivalent(o) 171 && transitionDataEquivalent(o)
178 && m_mask == o.m_mask 172 && m_mask == o.m_mask
179 && m_maskBoxImage == o.m_maskBoxImage 173 && m_maskBoxImage == o.m_maskBoxImage
180 && m_pageSize == o.m_pageSize 174 && m_pageSize == o.m_pageSize
181 && m_shapeOutside == o.m_shapeOutside
182 && m_shapeMargin == o.m_shapeMargin
183 && m_shapeImageThreshold == o.m_shapeImageThreshold
184 && m_clipPath == o.m_clipPath 175 && m_clipPath == o.m_clipPath
185 && m_textDecorationColor == o.m_textDecorationColor 176 && m_textDecorationColor == o.m_textDecorationColor
186 && m_order == o.m_order 177 && m_order == o.m_order
187 && m_objectPosition == o.m_objectPosition 178 && m_objectPosition == o.m_objectPosition
188 && m_pageSizeType == o.m_pageSizeType 179 && m_pageSizeType == o.m_pageSizeType
189 && m_transformStyle3D == o.m_transformStyle3D 180 && m_transformStyle3D == o.m_transformStyle3D
190 && m_backfaceVisibility == o.m_backfaceVisibility 181 && m_backfaceVisibility == o.m_backfaceVisibility
191 && m_alignContent == o.m_alignContent 182 && m_alignContent == o.m_alignContent
192 && m_alignItems == o.m_alignItems 183 && m_alignItems == o.m_alignItems
193 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 184 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 return false; 250 return false;
260 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 251 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
261 } 252 }
262 253
263 bool StyleRareNonInheritedData::hasFilters() const 254 bool StyleRareNonInheritedData::hasFilters() const
264 { 255 {
265 return m_filter.get() && !m_filter->m_operations.isEmpty(); 256 return m_filter.get() && !m_filter->m_operations.isEmpty();
266 } 257 }
267 258
268 } // namespace blink 259 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698