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

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

Issue 26588002: Remove support for -webkit-line-clamp Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Base files missing... Created 7 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 | Annotate | Revision Log
« 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 19 matching lines...) Expand all
30 30
31 namespace WebCore { 31 namespace WebCore {
32 32
33 StyleRareNonInheritedData::StyleRareNonInheritedData() 33 StyleRareNonInheritedData::StyleRareNonInheritedData()
34 : opacity(RenderStyle::initialOpacity()) 34 : opacity(RenderStyle::initialOpacity())
35 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator()) 35 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
36 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator()) 36 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
37 , m_perspective(RenderStyle::initialPerspective()) 37 , m_perspective(RenderStyle::initialPerspective())
38 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) 38 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
39 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) 39 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
40 , lineClamp(RenderStyle::initialLineClamp())
41 , m_draggableRegionMode(DraggableRegionNone) 40 , m_draggableRegionMode(DraggableRegionNone)
42 , m_mask(FillLayer(MaskFillLayer)) 41 , m_mask(FillLayer(MaskFillLayer))
43 , m_pageSize() 42 , m_pageSize()
44 , m_shapeInside(RenderStyle::initialShapeInside()) 43 , m_shapeInside(RenderStyle::initialShapeInside())
45 , m_shapeOutside(RenderStyle::initialShapeOutside()) 44 , m_shapeOutside(RenderStyle::initialShapeOutside())
46 , m_shapeMargin(RenderStyle::initialShapeMargin()) 45 , m_shapeMargin(RenderStyle::initialShapeMargin())
47 , m_shapePadding(RenderStyle::initialShapePadding()) 46 , 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_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 49 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 } 83 }
85 84
86 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 85 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
87 : RefCounted<StyleRareNonInheritedData>() 86 : RefCounted<StyleRareNonInheritedData>()
88 , opacity(o.opacity) 87 , opacity(o.opacity)
89 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) 88 , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
90 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) 89 , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
91 , m_perspective(o.m_perspective) 90 , m_perspective(o.m_perspective)
92 , m_perspectiveOriginX(o.m_perspectiveOriginX) 91 , m_perspectiveOriginX(o.m_perspectiveOriginX)
93 , m_perspectiveOriginY(o.m_perspectiveOriginY) 92 , m_perspectiveOriginY(o.m_perspectiveOriginY)
94 , lineClamp(o.lineClamp)
95 , m_draggableRegionMode(o.m_draggableRegionMode) 93 , m_draggableRegionMode(o.m_draggableRegionMode)
96 , m_deprecatedFlexibleBox(o.m_deprecatedFlexibleBox) 94 , m_deprecatedFlexibleBox(o.m_deprecatedFlexibleBox)
97 , m_flexibleBox(o.m_flexibleBox) 95 , m_flexibleBox(o.m_flexibleBox)
98 , m_marquee(o.m_marquee) 96 , m_marquee(o.m_marquee)
99 , m_multiCol(o.m_multiCol) 97 , m_multiCol(o.m_multiCol)
100 , m_transform(o.m_transform) 98 , m_transform(o.m_transform)
101 , m_filter(o.m_filter) 99 , m_filter(o.m_filter)
102 , m_grid(o.m_grid) 100 , m_grid(o.m_grid)
103 , m_gridItem(o.m_gridItem) 101 , m_gridItem(o.m_gridItem)
104 , m_content(o.m_content ? o.m_content->clone() : nullptr) 102 , m_content(o.m_content ? o.m_content->clone() : nullptr)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 161 }
164 162
165 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst 163 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst
166 { 164 {
167 return opacity == o.opacity 165 return opacity == o.opacity
168 && m_aspectRatioDenominator == o.m_aspectRatioDenominator 166 && m_aspectRatioDenominator == o.m_aspectRatioDenominator
169 && m_aspectRatioNumerator == o.m_aspectRatioNumerator 167 && m_aspectRatioNumerator == o.m_aspectRatioNumerator
170 && m_perspective == o.m_perspective 168 && m_perspective == o.m_perspective
171 && m_perspectiveOriginX == o.m_perspectiveOriginX 169 && m_perspectiveOriginX == o.m_perspectiveOriginX
172 && m_perspectiveOriginY == o.m_perspectiveOriginY 170 && m_perspectiveOriginY == o.m_perspectiveOriginY
173 && lineClamp == o.lineClamp
174 && m_draggableRegionMode == o.m_draggableRegionMode 171 && m_draggableRegionMode == o.m_draggableRegionMode
175 && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox 172 && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox
176 && m_flexibleBox == o.m_flexibleBox 173 && m_flexibleBox == o.m_flexibleBox
177 && m_marquee == o.m_marquee 174 && m_marquee == o.m_marquee
178 && m_multiCol == o.m_multiCol 175 && m_multiCol == o.m_multiCol
179 && m_transform == o.m_transform 176 && m_transform == o.m_transform
180 && m_filter == o.m_filter 177 && m_filter == o.m_filter
181 && m_grid == o.m_grid 178 && m_grid == o.m_grid
182 && m_gridItem == o.m_gridItem 179 && m_gridItem == o.m_gridItem
183 && contentDataEquivalent(o) 180 && contentDataEquivalent(o)
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return false; 294 return false;
298 return true; 295 return true;
299 } 296 }
300 297
301 bool StyleRareNonInheritedData::hasFilters() const 298 bool StyleRareNonInheritedData::hasFilters() const
302 { 299 {
303 return m_filter.get() && !m_filter->m_operations.isEmpty(); 300 return m_filter.get() && !m_filter->m_operations.isEmpty();
304 } 301 }
305 302
306 } // namespace WebCore 303 } // 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