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

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

Issue 1078883003: remove 'page' and 'size' since those are for printing, and that's obsolete in our world now (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge with trunk Created 5 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 | « sky/engine/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 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 , m_pageSize()
41 , m_clipPath(RenderStyle::initialClipPath()) 40 , m_clipPath(RenderStyle::initialClipPath())
42 , m_textDecorationColor(StyleColor::currentColor()) 41 , m_textDecorationColor(StyleColor::currentColor())
43 , m_order(RenderStyle::initialOrder()) 42 , m_order(RenderStyle::initialOrder())
44 , m_objectPosition(RenderStyle::initialObjectPosition()) 43 , m_objectPosition(RenderStyle::initialObjectPosition())
45 , m_pageSizeType(PAGE_SIZE_AUTO)
46 , m_transformStyle3D(RenderStyle::initialTransformStyle3D()) 44 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
47 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility()) 45 , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
48 , m_alignContent(RenderStyle::initialAlignContent()) 46 , m_alignContent(RenderStyle::initialAlignContent())
49 , m_alignItems(RenderStyle::initialAlignItems()) 47 , m_alignItems(RenderStyle::initialAlignItems())
50 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 48 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
51 , m_alignSelf(RenderStyle::initialAlignSelf()) 49 , m_alignSelf(RenderStyle::initialAlignSelf())
52 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t()) 50 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
53 , m_justifyContent(RenderStyle::initialJustifyContent()) 51 , m_justifyContent(RenderStyle::initialJustifyContent())
54 , userDrag(RenderStyle::initialUserDrag()) 52 , userDrag(RenderStyle::initialUserDrag())
55 , textOverflow(RenderStyle::initialTextOverflow()) 53 , textOverflow(RenderStyle::initialTextOverflow())
(...skipping 20 matching lines...) Expand all
76 , m_perspectiveOriginX(o.m_perspectiveOriginX) 74 , m_perspectiveOriginX(o.m_perspectiveOriginX)
77 , m_perspectiveOriginY(o.m_perspectiveOriginY) 75 , m_perspectiveOriginY(o.m_perspectiveOriginY)
78 , m_flexibleBox(o.m_flexibleBox) 76 , m_flexibleBox(o.m_flexibleBox)
79 , m_transform(o.m_transform) 77 , m_transform(o.m_transform)
80 , m_willChange(o.m_willChange) 78 , m_willChange(o.m_willChange)
81 , m_filter(o.m_filter) 79 , m_filter(o.m_filter)
82 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr) 80 , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
83 , m_boxShadow(o.m_boxShadow) 81 , m_boxShadow(o.m_boxShadow)
84 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr) 82 , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
85 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr) 83 , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions ) : nullptr)
86 , m_pageSize(o.m_pageSize)
87 , m_clipPath(o.m_clipPath) 84 , m_clipPath(o.m_clipPath)
88 , m_textDecorationColor(o.m_textDecorationColor) 85 , m_textDecorationColor(o.m_textDecorationColor)
89 , m_order(o.m_order) 86 , m_order(o.m_order)
90 , m_objectPosition(o.m_objectPosition) 87 , m_objectPosition(o.m_objectPosition)
91 , m_pageSizeType(o.m_pageSizeType)
92 , m_transformStyle3D(o.m_transformStyle3D) 88 , m_transformStyle3D(o.m_transformStyle3D)
93 , m_backfaceVisibility(o.m_backfaceVisibility) 89 , m_backfaceVisibility(o.m_backfaceVisibility)
94 , m_alignContent(o.m_alignContent) 90 , m_alignContent(o.m_alignContent)
95 , m_alignItems(o.m_alignItems) 91 , m_alignItems(o.m_alignItems)
96 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 92 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
97 , m_alignSelf(o.m_alignSelf) 93 , m_alignSelf(o.m_alignSelf)
98 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) 94 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
99 , m_justifyContent(o.m_justifyContent) 95 , m_justifyContent(o.m_justifyContent)
100 , userDrag(o.userDrag) 96 , userDrag(o.userDrag)
101 , textOverflow(o.textOverflow) 97 , textOverflow(o.textOverflow)
(...skipping 24 matching lines...) Expand all
126 && m_perspectiveOriginX == o.m_perspectiveOriginX 122 && m_perspectiveOriginX == o.m_perspectiveOriginX
127 && m_perspectiveOriginY == o.m_perspectiveOriginY 123 && m_perspectiveOriginY == o.m_perspectiveOriginY
128 && m_flexibleBox == o.m_flexibleBox 124 && m_flexibleBox == o.m_flexibleBox
129 && m_transform == o.m_transform 125 && m_transform == o.m_transform
130 && m_willChange == o.m_willChange 126 && m_willChange == o.m_willChange
131 && m_filter == o.m_filter 127 && m_filter == o.m_filter
132 && counterDataEquivalent(o) 128 && counterDataEquivalent(o)
133 && shadowDataEquivalent(o) 129 && shadowDataEquivalent(o)
134 && animationDataEquivalent(o) 130 && animationDataEquivalent(o)
135 && transitionDataEquivalent(o) 131 && transitionDataEquivalent(o)
136 && m_pageSize == o.m_pageSize
137 && m_clipPath == o.m_clipPath 132 && m_clipPath == o.m_clipPath
138 && m_textDecorationColor == o.m_textDecorationColor 133 && m_textDecorationColor == o.m_textDecorationColor
139 && m_order == o.m_order 134 && m_order == o.m_order
140 && m_objectPosition == o.m_objectPosition 135 && m_objectPosition == o.m_objectPosition
141 && m_pageSizeType == o.m_pageSizeType
142 && m_transformStyle3D == o.m_transformStyle3D 136 && m_transformStyle3D == o.m_transformStyle3D
143 && m_backfaceVisibility == o.m_backfaceVisibility 137 && m_backfaceVisibility == o.m_backfaceVisibility
144 && m_alignContent == o.m_alignContent 138 && m_alignContent == o.m_alignContent
145 && m_alignItems == o.m_alignItems 139 && m_alignItems == o.m_alignItems
146 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 140 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
147 && m_alignSelf == o.m_alignSelf 141 && m_alignSelf == o.m_alignSelf
148 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment 142 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
149 && m_justifyContent == o.m_justifyContent 143 && m_justifyContent == o.m_justifyContent
150 && userDrag == o.userDrag 144 && userDrag == o.userDrag
151 && textOverflow == o.textOverflow 145 && textOverflow == o.textOverflow
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 return false; 183 return false;
190 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 184 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
191 } 185 }
192 186
193 bool StyleRareNonInheritedData::hasFilters() const 187 bool StyleRareNonInheritedData::hasFilters() const
194 { 188 {
195 return m_filter.get() && !m_filter->m_operations.isEmpty(); 189 return m_filter.get() && !m_filter->m_operations.isEmpty();
196 } 190 }
197 191
198 } // namespace blink 192 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698