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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 647723002: Remove -webkit-aspect-ratio. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Forgot to remove webkitAspectRatio from virtual/stable. :( Created 6 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
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.cpp » ('j') | 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 bool counterDataEquivalent(const StyleRareNonInheritedData&) const; 85 bool counterDataEquivalent(const StyleRareNonInheritedData&) const;
86 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const; 86 bool shadowDataEquivalent(const StyleRareNonInheritedData&) const;
87 bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const; 87 bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const;
88 bool animationDataEquivalent(const StyleRareNonInheritedData&) const; 88 bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
89 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; 89 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
90 bool hasFilters() const; 90 bool hasFilters() const;
91 bool hasOpacity() const { return opacity < 1; } 91 bool hasOpacity() const { return opacity < 1; }
92 92
93 float opacity; // Whether or not we're transparent. 93 float opacity; // Whether or not we're transparent.
94 94
95 float m_aspectRatioDenominator;
96 float m_aspectRatioNumerator;
97
98 float m_perspective; 95 float m_perspective;
99 Length m_perspectiveOriginX; 96 Length m_perspectiveOriginX;
100 Length m_perspectiveOriginY; 97 Length m_perspectiveOriginY;
101 98
102 LineClampValue lineClamp; // An Apple extension. 99 LineClampValue lineClamp; // An Apple extension.
103 DraggableRegionMode m_draggableRegionMode; 100 DraggableRegionMode m_draggableRegionMode;
104 101
105 DataRef<StyleDeprecatedFlexibleBoxData> m_deprecatedFlexibleBox; // Flexible box properties 102 DataRef<StyleDeprecatedFlexibleBoxData> m_deprecatedFlexibleBox; // Flexible box properties
106 DataRef<StyleFlexibleBoxData> m_flexibleBox; 103 DataRef<StyleFlexibleBoxData> m_flexibleBox;
107 DataRef<StyleMarqueeData> m_marquee; // Marquee properties 104 DataRef<StyleMarqueeData> m_marquee; // Marquee properties
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 unsigned m_wrapFlow: 3; // WrapFlow 169 unsigned m_wrapFlow: 3; // WrapFlow
173 unsigned m_wrapThrough: 1; // WrapThrough 170 unsigned m_wrapThrough: 1; // WrapThrough
174 171
175 unsigned m_hasCurrentOpacityAnimation : 1; 172 unsigned m_hasCurrentOpacityAnimation : 1;
176 unsigned m_hasCurrentTransformAnimation : 1; 173 unsigned m_hasCurrentTransformAnimation : 1;
177 unsigned m_hasCurrentFilterAnimation : 1; 174 unsigned m_hasCurrentFilterAnimation : 1;
178 unsigned m_runningOpacityAnimationOnCompositor : 1; 175 unsigned m_runningOpacityAnimationOnCompositor : 1;
179 unsigned m_runningTransformAnimationOnCompositor : 1; 176 unsigned m_runningTransformAnimationOnCompositor : 1;
180 unsigned m_runningFilterAnimationOnCompositor : 1; 177 unsigned m_runningFilterAnimationOnCompositor : 1;
181 178
182 unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been sp ecified.
183
184 unsigned m_effectiveBlendMode: 5; // EBlendMode 179 unsigned m_effectiveBlendMode: 5; // EBlendMode
185 180
186 unsigned m_touchAction : TouchActionBits; // TouchAction 181 unsigned m_touchAction : TouchActionBits; // TouchAction
187 182
188 unsigned m_objectFit : 3; // ObjectFit 183 unsigned m_objectFit : 3; // ObjectFit
189 184
190 unsigned m_isolation : 1; // Isolation 185 unsigned m_isolation : 1; // Isolation
191 186
192 unsigned m_justifyItems : 4; // ItemPosition 187 unsigned m_justifyItems : 4; // ItemPosition
193 unsigned m_justifyItemsOverflowAlignment : 2; // OverflowAlignment 188 unsigned m_justifyItemsOverflowAlignment : 2; // OverflowAlignment
(...skipping 16 matching lines...) Expand all
210 unsigned m_hasInlineTransform : 1; 205 unsigned m_hasInlineTransform : 1;
211 206
212 private: 207 private:
213 StyleRareNonInheritedData(); 208 StyleRareNonInheritedData();
214 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 209 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
215 }; 210 };
216 211
217 } // namespace blink 212 } // namespace blink
218 213
219 #endif // StyleRareNonInheritedData_h 214 #endif // StyleRareNonInheritedData_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698