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

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

Issue 607593002: Remove -webkit-border-fit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase 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 | 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 , m_alignItems(RenderStyle::initialAlignItems()) 64 , m_alignItems(RenderStyle::initialAlignItems())
65 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent()) 65 , m_alignItemsOverflowAlignment(RenderStyle::initialAlignItemsOverflowAlignm ent())
66 , m_alignSelf(RenderStyle::initialAlignSelf()) 66 , m_alignSelf(RenderStyle::initialAlignSelf())
67 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t()) 67 , m_alignSelfOverflowAlignment(RenderStyle::initialAlignSelfOverflowAlignmen t())
68 , m_justifyContent(RenderStyle::initialJustifyContent()) 68 , m_justifyContent(RenderStyle::initialJustifyContent())
69 , userDrag(RenderStyle::initialUserDrag()) 69 , userDrag(RenderStyle::initialUserDrag())
70 , textOverflow(RenderStyle::initialTextOverflow()) 70 , textOverflow(RenderStyle::initialTextOverflow())
71 , marginBeforeCollapse(MCOLLAPSE) 71 , marginBeforeCollapse(MCOLLAPSE)
72 , marginAfterCollapse(MCOLLAPSE) 72 , marginAfterCollapse(MCOLLAPSE)
73 , m_appearance(RenderStyle::initialAppearance()) 73 , m_appearance(RenderStyle::initialAppearance())
74 , m_borderFit(RenderStyle::initialBorderFit())
75 , m_textCombine(RenderStyle::initialTextCombine()) 74 , m_textCombine(RenderStyle::initialTextCombine())
76 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 75 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
77 , m_wrapFlow(RenderStyle::initialWrapFlow()) 76 , m_wrapFlow(RenderStyle::initialWrapFlow())
78 , m_wrapThrough(RenderStyle::initialWrapThrough()) 77 , m_wrapThrough(RenderStyle::initialWrapThrough())
79 , m_hasCurrentOpacityAnimation(false) 78 , m_hasCurrentOpacityAnimation(false)
80 , m_hasCurrentTransformAnimation(false) 79 , m_hasCurrentTransformAnimation(false)
81 , m_hasCurrentFilterAnimation(false) 80 , m_hasCurrentFilterAnimation(false)
82 , m_runningOpacityAnimationOnCompositor(false) 81 , m_runningOpacityAnimationOnCompositor(false)
83 , m_runningTransformAnimationOnCompositor(false) 82 , m_runningTransformAnimationOnCompositor(false)
84 , m_runningFilterAnimationOnCompositor(false) 83 , m_runningFilterAnimationOnCompositor(false)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 , m_alignItems(o.m_alignItems) 147 , m_alignItems(o.m_alignItems)
149 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) 148 , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment)
150 , m_alignSelf(o.m_alignSelf) 149 , m_alignSelf(o.m_alignSelf)
151 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) 150 , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment)
152 , m_justifyContent(o.m_justifyContent) 151 , m_justifyContent(o.m_justifyContent)
153 , userDrag(o.userDrag) 152 , userDrag(o.userDrag)
154 , textOverflow(o.textOverflow) 153 , textOverflow(o.textOverflow)
155 , marginBeforeCollapse(o.marginBeforeCollapse) 154 , marginBeforeCollapse(o.marginBeforeCollapse)
156 , marginAfterCollapse(o.marginAfterCollapse) 155 , marginAfterCollapse(o.marginAfterCollapse)
157 , m_appearance(o.m_appearance) 156 , m_appearance(o.m_appearance)
158 , m_borderFit(o.m_borderFit)
159 , m_textCombine(o.m_textCombine) 157 , m_textCombine(o.m_textCombine)
160 , m_textDecorationStyle(o.m_textDecorationStyle) 158 , m_textDecorationStyle(o.m_textDecorationStyle)
161 , m_wrapFlow(o.m_wrapFlow) 159 , m_wrapFlow(o.m_wrapFlow)
162 , m_wrapThrough(o.m_wrapThrough) 160 , m_wrapThrough(o.m_wrapThrough)
163 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation) 161 , m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation)
164 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation) 162 , m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation)
165 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation) 163 , m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation)
166 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor) 164 , m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnComposi tor)
167 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor) 165 , m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCom positor)
168 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r) 166 , m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnComposito r)
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 && m_alignItems == o.m_alignItems 237 && m_alignItems == o.m_alignItems
240 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment 238 && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment
241 && m_alignSelf == o.m_alignSelf 239 && m_alignSelf == o.m_alignSelf
242 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment 240 && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment
243 && m_justifyContent == o.m_justifyContent 241 && m_justifyContent == o.m_justifyContent
244 && userDrag == o.userDrag 242 && userDrag == o.userDrag
245 && textOverflow == o.textOverflow 243 && textOverflow == o.textOverflow
246 && marginBeforeCollapse == o.marginBeforeCollapse 244 && marginBeforeCollapse == o.marginBeforeCollapse
247 && marginAfterCollapse == o.marginAfterCollapse 245 && marginAfterCollapse == o.marginAfterCollapse
248 && m_appearance == o.m_appearance 246 && m_appearance == o.m_appearance
249 && m_borderFit == o.m_borderFit
250 && m_textCombine == o.m_textCombine 247 && m_textCombine == o.m_textCombine
251 && m_textDecorationStyle == o.m_textDecorationStyle 248 && m_textDecorationStyle == o.m_textDecorationStyle
252 && m_wrapFlow == o.m_wrapFlow 249 && m_wrapFlow == o.m_wrapFlow
253 && m_wrapThrough == o.m_wrapThrough 250 && m_wrapThrough == o.m_wrapThrough
254 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation 251 && m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation
255 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation 252 && m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
256 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation 253 && m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
257 && m_effectiveBlendMode == o.m_effectiveBlendMode 254 && m_effectiveBlendMode == o.m_effectiveBlendMode
258 && m_hasAspectRatio == o.m_hasAspectRatio 255 && m_hasAspectRatio == o.m_hasAspectRatio
259 && m_touchAction == o.m_touchAction 256 && m_touchAction == o.m_touchAction
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 return false; 311 return false;
315 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions); 312 return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
316 } 313 }
317 314
318 bool StyleRareNonInheritedData::hasFilters() const 315 bool StyleRareNonInheritedData::hasFilters() const
319 { 316 {
320 return m_filter.get() && !m_filter->m_operations.isEmpty(); 317 return m_filter.get() && !m_filter->m_operations.isEmpty();
321 } 318 }
322 319
323 } // namespace blink 320 } // namespace blink
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