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

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

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove now unused segmentIsEmpty Created 6 years, 9 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 24 matching lines...) Expand all
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_draggableRegionMode(DraggableRegionNone) 42 , m_draggableRegionMode(DraggableRegionNone)
43 , m_mask(MaskFillLayer, true) 43 , m_mask(MaskFillLayer, true)
44 , m_pageSize() 44 , m_pageSize()
45 , m_shapeInside(RenderStyle::initialShapeInside())
46 , m_shapeOutside(RenderStyle::initialShapeOutside()) 45 , m_shapeOutside(RenderStyle::initialShapeOutside())
47 , m_shapeMargin(RenderStyle::initialShapeMargin()) 46 , m_shapeMargin(RenderStyle::initialShapeMargin())
48 , m_shapePadding(RenderStyle::initialShapePadding()) 47 , m_shapePadding(RenderStyle::initialShapePadding())
49 , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold()) 48 , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
50 , m_clipPath(RenderStyle::initialClipPath()) 49 , m_clipPath(RenderStyle::initialClipPath())
51 , m_textDecorationColor(StyleColor::currentColor()) 50 , m_textDecorationColor(StyleColor::currentColor())
52 , m_visitedLinkTextDecorationColor(StyleColor::currentColor()) 51 , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
53 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 52 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
54 , m_visitedLinkOutlineColor(StyleColor::currentColor()) 53 , m_visitedLinkOutlineColor(StyleColor::currentColor())
55 , m_visitedLinkBorderLeftColor(StyleColor::currentColor()) 54 , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 , m_gridItem(o.m_gridItem) 110 , m_gridItem(o.m_gridItem)
112 , m_content(o.m_content ? o.m_content->clone() : nullptr) 111 , m_content(o.m_content ? o.m_content->clone() : nullptr)
113 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 112 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
114 , m_boxShadow(o.m_boxShadow) 113 , m_boxShadow(o.m_boxShadow)
115 , m_boxReflect(o.m_boxReflect) 114 , m_boxReflect(o.m_boxReflect)
116 , m_animations(o.m_animations ? adoptPtrWillBeNoop(new CSSAnimationDataList( *o.m_animations)) : nullptr) 115 , m_animations(o.m_animations ? adoptPtrWillBeNoop(new CSSAnimationDataList( *o.m_animations)) : nullptr)
117 , m_transitions(o.m_transitions ? adoptPtrWillBeNoop(new CSSAnimationDataLis t(*o.m_transitions)) : nullptr) 116 , m_transitions(o.m_transitions ? adoptPtrWillBeNoop(new CSSAnimationDataLis t(*o.m_transitions)) : nullptr)
118 , m_mask(o.m_mask) 117 , m_mask(o.m_mask)
119 , m_maskBoxImage(o.m_maskBoxImage) 118 , m_maskBoxImage(o.m_maskBoxImage)
120 , m_pageSize(o.m_pageSize) 119 , m_pageSize(o.m_pageSize)
121 , m_shapeInside(o.m_shapeInside)
122 , m_shapeOutside(o.m_shapeOutside) 120 , m_shapeOutside(o.m_shapeOutside)
123 , m_shapeMargin(o.m_shapeMargin) 121 , m_shapeMargin(o.m_shapeMargin)
124 , m_shapePadding(o.m_shapePadding) 122 , m_shapePadding(o.m_shapePadding)
125 , m_shapeImageThreshold(o.m_shapeImageThreshold) 123 , m_shapeImageThreshold(o.m_shapeImageThreshold)
126 , m_clipPath(o.m_clipPath) 124 , m_clipPath(o.m_clipPath)
127 , m_textDecorationColor(o.m_textDecorationColor) 125 , m_textDecorationColor(o.m_textDecorationColor)
128 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) 126 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
129 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 127 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
130 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) 128 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
131 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor) 129 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 && m_gridItem == o.m_gridItem 191 && m_gridItem == o.m_gridItem
194 && contentDataEquivalent(o) 192 && contentDataEquivalent(o)
195 && counterDataEquivalent(o) 193 && counterDataEquivalent(o)
196 && shadowDataEquivalent(o) 194 && shadowDataEquivalent(o)
197 && reflectionDataEquivalent(o) 195 && reflectionDataEquivalent(o)
198 && animationDataEquivalent(o) 196 && animationDataEquivalent(o)
199 && transitionDataEquivalent(o) 197 && transitionDataEquivalent(o)
200 && m_mask == o.m_mask 198 && m_mask == o.m_mask
201 && m_maskBoxImage == o.m_maskBoxImage 199 && m_maskBoxImage == o.m_maskBoxImage
202 && m_pageSize == o.m_pageSize 200 && m_pageSize == o.m_pageSize
203 && m_shapeInside == o.m_shapeInside
204 && m_shapeOutside == o.m_shapeOutside 201 && m_shapeOutside == o.m_shapeOutside
205 && m_shapeMargin == o.m_shapeMargin 202 && m_shapeMargin == o.m_shapeMargin
206 && m_shapePadding == o.m_shapePadding 203 && m_shapePadding == o.m_shapePadding
207 && m_shapeImageThreshold == o.m_shapeImageThreshold 204 && m_shapeImageThreshold == o.m_shapeImageThreshold
208 && m_clipPath == o.m_clipPath 205 && m_clipPath == o.m_clipPath
209 && m_textDecorationColor == o.m_textDecorationColor 206 && m_textDecorationColor == o.m_textDecorationColor
210 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r 207 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r
211 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 208 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
212 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 209 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
213 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor 210 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return false; 304 return false;
308 return true; 305 return true;
309 } 306 }
310 307
311 bool StyleRareNonInheritedData::hasFilters() const 308 bool StyleRareNonInheritedData::hasFilters() const
312 { 309 {
313 return m_filter.get() && !m_filter->m_operations.isEmpty(); 310 return m_filter.get() && !m_filter->m_operations.isEmpty();
314 } 311 }
315 312
316 } // namespace WebCore 313 } // namespace WebCore
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