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

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

Issue 761283002: Remove webkit-line-clamp (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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
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 blink { 31 namespace blink {
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_mask(MaskFillLayer, true) 40 , m_mask(MaskFillLayer, true)
42 , m_pageSize() 41 , m_pageSize()
43 , m_clipPath(RenderStyle::initialClipPath()) 42 , m_clipPath(RenderStyle::initialClipPath())
44 , m_textDecorationColor(StyleColor::currentColor()) 43 , m_textDecorationColor(StyleColor::currentColor())
45 , m_order(RenderStyle::initialOrder()) 44 , m_order(RenderStyle::initialOrder())
46 , m_objectPosition(RenderStyle::initialObjectPosition()) 45 , m_objectPosition(RenderStyle::initialObjectPosition())
47 , m_pageSizeType(PAGE_SIZE_AUTO) 46 , m_pageSizeType(PAGE_SIZE_AUTO)
48 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 47 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
49 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 48 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
50 , m_alignContent(RenderStyle::initialAlignContent()) 49 , m_alignContent(RenderStyle::initialAlignContent())
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 81 }
83 82
84 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 83 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
85 : RefCounted<StyleRareNonInheritedData>() 84 : RefCounted<StyleRareNonInheritedData>()
86 , opacity(o.opacity) 85 , opacity(o.opacity)
87 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) 86 , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
88 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) 87 , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
89 , m_perspective(o.m_perspective) 88 , m_perspective(o.m_perspective)
90 , m_perspectiveOriginX(o.m_perspectiveOriginX) 89 , m_perspectiveOriginX(o.m_perspectiveOriginX)
91 , m_perspectiveOriginY(o.m_perspectiveOriginY) 90 , m_perspectiveOriginY(o.m_perspectiveOriginY)
92 , lineClamp(o.lineClamp)
93 , m_flexibleBox(o.m_flexibleBox) 91 , m_flexibleBox(o.m_flexibleBox)
94 , m_transform(o.m_transform) 92 , m_transform(o.m_transform)
95 , m_willChange(o.m_willChange) 93 , m_willChange(o.m_willChange)
96 , m_filter(o.m_filter) 94 , m_filter(o.m_filter)
97 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 95 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
98 , m_boxShadow(o.m_boxShadow) 96 , m_boxShadow(o.m_boxShadow)
99 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr) 97 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
100 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr) 98 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr)
101 , m_mask(o.m_mask) 99 , m_mask(o.m_mask)
102 , m_maskBoxImage(o.m_maskBoxImage) 100 , m_maskBoxImage(o.m_maskBoxImage)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 144 }
147 145
148 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst 146 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst
149 { 147 {
150 return opacity == o.opacity 148 return opacity == o.opacity
151 && m_aspectRatioDenominator == o.m_aspectRatioDenominator 149 && m_aspectRatioDenominator == o.m_aspectRatioDenominator
152 && m_aspectRatioNumerator == o.m_aspectRatioNumerator 150 && m_aspectRatioNumerator == o.m_aspectRatioNumerator
153 && m_perspective == o.m_perspective 151 && m_perspective == o.m_perspective
154 && m_perspectiveOriginX == o.m_perspectiveOriginX 152 && m_perspectiveOriginX == o.m_perspectiveOriginX
155 && m_perspectiveOriginY == o.m_perspectiveOriginY 153 && m_perspectiveOriginY == o.m_perspectiveOriginY
156 && lineClamp == o.lineClamp
157 && m_flexibleBox == o.m_flexibleBox 154 && m_flexibleBox == o.m_flexibleBox
158 && m_transform == o.m_transform 155 && m_transform == o.m_transform
159 && m_willChange == o.m_willChange 156 && m_willChange == o.m_willChange
160 && m_filter == o.m_filter 157 && m_filter == o.m_filter
161 && counterDataEquivalent(o) 158 && counterDataEquivalent(o)
162 && shadowDataEquivalent(o) 159 && shadowDataEquivalent(o)
163 && animationDataEquivalent(o) 160 && animationDataEquivalent(o)
164 && transitionDataEquivalent(o) 161 && transitionDataEquivalent(o)
165 && m_mask == o.m_mask 162 && m_mask == o.m_mask
166 && m_maskBoxImage == o.m_maskBoxImage 163 && m_maskBoxImage == o.m_maskBoxImage
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return false; 225 return false;
229 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 226 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
230 } 227 }
231 228
232 bool StyleRareNonInheritedData::hasFilters() const 229 bool StyleRareNonInheritedData::hasFilters() const
233 { 230 {
234 return m_filter.get() && !m_filter->m_operations.isEmpty(); 231 return m_filter.get() && !m_filter->m_operations.isEmpty();
235 } 232 }
236 233
237 } // namespace blink 234 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698