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

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

Issue 216793009: Remove shape-padding (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove m_padding Created 6 years, 8 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 26 matching lines...) Expand all
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_shapeOutside(RenderStyle::initialShapeOutside()) 45 , m_shapeOutside(RenderStyle::initialShapeOutside())
46 , m_shapeMargin(RenderStyle::initialShapeMargin()) 46 , m_shapeMargin(RenderStyle::initialShapeMargin())
47 , m_shapePadding(RenderStyle::initialShapePadding())
48 , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold()) 47 , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
49 , m_clipPath(RenderStyle::initialClipPath()) 48 , m_clipPath(RenderStyle::initialClipPath())
50 , m_textDecorationColor(StyleColor::currentColor()) 49 , m_textDecorationColor(StyleColor::currentColor())
51 , m_visitedLinkTextDecorationColor(StyleColor::currentColor()) 50 , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
52 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 51 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
53 , m_visitedLinkOutlineColor(StyleColor::currentColor()) 52 , m_visitedLinkOutlineColor(StyleColor::currentColor())
54 , m_visitedLinkBorderLeftColor(StyleColor::currentColor()) 53 , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
55 , m_visitedLinkBorderRightColor(StyleColor::currentColor()) 54 , m_visitedLinkBorderRightColor(StyleColor::currentColor())
56 , m_visitedLinkBorderTopColor(StyleColor::currentColor()) 55 , m_visitedLinkBorderTopColor(StyleColor::currentColor())
57 , m_visitedLinkBorderBottomColor(StyleColor::currentColor()) 56 , m_visitedLinkBorderBottomColor(StyleColor::currentColor())
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 111 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
113 , m_boxShadow(o.m_boxShadow) 112 , m_boxShadow(o.m_boxShadow)
114 , m_boxReflect(o.m_boxReflect) 113 , m_boxReflect(o.m_boxReflect)
115 , m_animations(o.m_animations ? adoptPtrWillBeNoop(new CSSAnimationDataList( *o.m_animations)) : nullptr) 114 , m_animations(o.m_animations ? adoptPtrWillBeNoop(new CSSAnimationDataList( *o.m_animations)) : nullptr)
116 , m_transitions(o.m_transitions ? adoptPtrWillBeNoop(new CSSAnimationDataLis t(*o.m_transitions)) : nullptr) 115 , m_transitions(o.m_transitions ? adoptPtrWillBeNoop(new CSSAnimationDataLis t(*o.m_transitions)) : nullptr)
117 , m_mask(o.m_mask) 116 , m_mask(o.m_mask)
118 , m_maskBoxImage(o.m_maskBoxImage) 117 , m_maskBoxImage(o.m_maskBoxImage)
119 , m_pageSize(o.m_pageSize) 118 , m_pageSize(o.m_pageSize)
120 , m_shapeOutside(o.m_shapeOutside) 119 , m_shapeOutside(o.m_shapeOutside)
121 , m_shapeMargin(o.m_shapeMargin) 120 , m_shapeMargin(o.m_shapeMargin)
122 , m_shapePadding(o.m_shapePadding)
123 , m_shapeImageThreshold(o.m_shapeImageThreshold) 121 , m_shapeImageThreshold(o.m_shapeImageThreshold)
124 , m_clipPath(o.m_clipPath) 122 , m_clipPath(o.m_clipPath)
125 , m_textDecorationColor(o.m_textDecorationColor) 123 , m_textDecorationColor(o.m_textDecorationColor)
126 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor) 124 , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
127 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor) 125 , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
128 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor) 126 , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
129 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor) 127 , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
130 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor) 128 , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
131 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor) 129 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
132 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor) 130 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 && counterDataEquivalent(o) 191 && counterDataEquivalent(o)
194 && shadowDataEquivalent(o) 192 && shadowDataEquivalent(o)
195 && reflectionDataEquivalent(o) 193 && reflectionDataEquivalent(o)
196 && animationDataEquivalent(o) 194 && animationDataEquivalent(o)
197 && transitionDataEquivalent(o) 195 && transitionDataEquivalent(o)
198 && m_mask == o.m_mask 196 && m_mask == o.m_mask
199 && m_maskBoxImage == o.m_maskBoxImage 197 && m_maskBoxImage == o.m_maskBoxImage
200 && m_pageSize == o.m_pageSize 198 && m_pageSize == o.m_pageSize
201 && m_shapeOutside == o.m_shapeOutside 199 && m_shapeOutside == o.m_shapeOutside
202 && m_shapeMargin == o.m_shapeMargin 200 && m_shapeMargin == o.m_shapeMargin
203 && m_shapePadding == o.m_shapePadding
204 && m_shapeImageThreshold == o.m_shapeImageThreshold 201 && m_shapeImageThreshold == o.m_shapeImageThreshold
205 && m_clipPath == o.m_clipPath 202 && m_clipPath == o.m_clipPath
206 && m_textDecorationColor == o.m_textDecorationColor 203 && m_textDecorationColor == o.m_textDecorationColor
207 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r 204 && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColo r
208 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor 205 && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
209 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor 206 && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
210 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor 207 && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
211 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor 208 && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
212 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor 209 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
213 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor 210 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 return false; 301 return false;
305 return true; 302 return true;
306 } 303 }
307 304
308 bool StyleRareNonInheritedData::hasFilters() const 305 bool StyleRareNonInheritedData::hasFilters() const
309 { 306 {
310 return m_filter.get() && !m_filter->m_operations.isEmpty(); 307 return m_filter.get() && !m_filter->m_operations.isEmpty();
311 } 308 }
312 309
313 } // namespace WebCore 310 } // 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