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

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

Issue 15748002: Initial support for experimental touch-action CSS feature (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unnecessary CSSParserContext change Created 7 years, 7 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/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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 , m_borderFit(RenderStyle::initialBorderFit()) 73 , m_borderFit(RenderStyle::initialBorderFit())
74 , m_textCombine(RenderStyle::initialTextCombine()) 74 , m_textCombine(RenderStyle::initialTextCombine())
75 #if ENABLE(CSS3_TEXT) 75 #if ENABLE(CSS3_TEXT)
76 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 76 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
77 #endif // CSS3_TEXT 77 #endif // CSS3_TEXT
78 , m_wrapFlow(RenderStyle::initialWrapFlow()) 78 , m_wrapFlow(RenderStyle::initialWrapFlow())
79 , m_wrapThrough(RenderStyle::initialWrapThrough()) 79 , m_wrapThrough(RenderStyle::initialWrapThrough())
80 , m_runningAcceleratedAnimation(false) 80 , m_runningAcceleratedAnimation(false)
81 , m_hasAspectRatio(false) 81 , m_hasAspectRatio(false)
82 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) 82 , m_effectiveBlendMode(RenderStyle::initialBlendMode())
83 , m_touchAction(RenderStyle::initialTouchAction())
83 { 84 {
84 m_maskBoxImage.setMaskDefaults(); 85 m_maskBoxImage.setMaskDefaults();
85 } 86 }
86 87
87 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 88 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
88 : RefCounted<StyleRareNonInheritedData>() 89 : RefCounted<StyleRareNonInheritedData>()
89 , opacity(o.opacity) 90 , opacity(o.opacity)
90 , m_aspectRatioDenominator(o.m_aspectRatioDenominator) 91 , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
91 , m_aspectRatioNumerator(o.m_aspectRatioNumerator) 92 , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
92 , m_perspective(o.m_perspective) 93 , m_perspective(o.m_perspective)
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 , m_borderFit(o.m_borderFit) 149 , m_borderFit(o.m_borderFit)
149 , m_textCombine(o.m_textCombine) 150 , m_textCombine(o.m_textCombine)
150 #if ENABLE(CSS3_TEXT) 151 #if ENABLE(CSS3_TEXT)
151 , m_textDecorationStyle(o.m_textDecorationStyle) 152 , m_textDecorationStyle(o.m_textDecorationStyle)
152 #endif // CSS3_TEXT 153 #endif // CSS3_TEXT
153 , m_wrapFlow(o.m_wrapFlow) 154 , m_wrapFlow(o.m_wrapFlow)
154 , m_wrapThrough(o.m_wrapThrough) 155 , m_wrapThrough(o.m_wrapThrough)
155 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation) 156 , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
156 , m_hasAspectRatio(o.m_hasAspectRatio) 157 , m_hasAspectRatio(o.m_hasAspectRatio)
157 , m_effectiveBlendMode(o.m_effectiveBlendMode) 158 , m_effectiveBlendMode(o.m_effectiveBlendMode)
159 , m_touchAction(o.m_touchAction)
158 { 160 {
159 } 161 }
160 162
161 StyleRareNonInheritedData::~StyleRareNonInheritedData() 163 StyleRareNonInheritedData::~StyleRareNonInheritedData()
162 { 164 {
163 } 165 }
164 166
165 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst 167 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c onst
166 { 168 {
167 return opacity == o.opacity 169 return opacity == o.opacity
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 && m_appearance == o.m_appearance 227 && m_appearance == o.m_appearance
226 && m_borderFit == o.m_borderFit 228 && m_borderFit == o.m_borderFit
227 && m_textCombine == o.m_textCombine 229 && m_textCombine == o.m_textCombine
228 #if ENABLE(CSS3_TEXT) 230 #if ENABLE(CSS3_TEXT)
229 && m_textDecorationStyle == o.m_textDecorationStyle 231 && m_textDecorationStyle == o.m_textDecorationStyle
230 #endif // CSS3_TEXT 232 #endif // CSS3_TEXT
231 && m_wrapFlow == o.m_wrapFlow 233 && m_wrapFlow == o.m_wrapFlow
232 && m_wrapThrough == o.m_wrapThrough 234 && m_wrapThrough == o.m_wrapThrough
233 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation 235 && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
234 && m_effectiveBlendMode == o.m_effectiveBlendMode 236 && m_effectiveBlendMode == o.m_effectiveBlendMode
235 && m_hasAspectRatio == o.m_hasAspectRatio; 237 && m_hasAspectRatio == o.m_hasAspectRatio
238 && m_touchAction == o.m_touchAction;
236 } 239 }
237 240
238 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 241 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
239 { 242 {
240 ContentData* a = m_content.get(); 243 ContentData* a = m_content.get();
241 ContentData* b = o.m_content.get(); 244 ContentData* b = o.m_content.get();
242 245
243 while (a && b && *a == *b) { 246 while (a && b && *a == *b) {
244 a = a->next(); 247 a = a->next();
245 b = b->next(); 248 b = b->next();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 info.addMember(m_regionThread, "regionThread"); 323 info.addMember(m_regionThread, "regionThread");
321 324
322 info.ignoreMember(m_perspectiveOriginX); 325 info.ignoreMember(m_perspectiveOriginX);
323 info.ignoreMember(m_perspectiveOriginY); 326 info.ignoreMember(m_perspectiveOriginY);
324 info.ignoreMember(m_pageSize); 327 info.ignoreMember(m_pageSize);
325 info.ignoreMember(m_shapeMargin); 328 info.ignoreMember(m_shapeMargin);
326 info.ignoreMember(m_shapePadding); 329 info.ignoreMember(m_shapePadding);
327 } 330 }
328 331
329 } // namespace WebCore 332 } // 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