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

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

Issue 723373006: Add CSS parsing support for the scroll-blocks-on property (in place of touch-action-delay) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Apply CR feedback Created 6 years, 1 month 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
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 , m_effectiveBlendMode(RenderStyle::initialBlendMode()) 83 , m_effectiveBlendMode(RenderStyle::initialBlendMode())
84 , m_touchAction(RenderStyle::initialTouchAction()) 84 , m_touchAction(RenderStyle::initialTouchAction())
85 , m_objectFit(RenderStyle::initialObjectFit()) 85 , m_objectFit(RenderStyle::initialObjectFit())
86 , m_isolation(RenderStyle::initialIsolation()) 86 , m_isolation(RenderStyle::initialIsolation())
87 , m_justifyItems(RenderStyle::initialJustifyItems()) 87 , m_justifyItems(RenderStyle::initialJustifyItems())
88 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl ignment()) 88 , m_justifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAl ignment())
89 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType()) 89 , m_justifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType())
90 , m_justifySelf(RenderStyle::initialJustifySelf()) 90 , m_justifySelf(RenderStyle::initialJustifySelf())
91 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment()) 91 , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlig nment())
92 , m_scrollBehavior(RenderStyle::initialScrollBehavior()) 92 , m_scrollBehavior(RenderStyle::initialScrollBehavior())
93 , m_scrollBlocksOn(RenderStyle::initialScrollBlocksOn())
93 , m_requiresAcceleratedCompositingForExternalReasons(false) 94 , m_requiresAcceleratedCompositingForExternalReasons(false)
94 , m_hasInlineTransform(false) 95 , m_hasInlineTransform(false)
95 , m_resize(RenderStyle::initialResize()) 96 , m_resize(RenderStyle::initialResize())
96 { 97 {
97 m_maskBoxImage.setMaskDefaults(); 98 m_maskBoxImage.setMaskDefaults();
98 } 99 }
99 100
100 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o) 101 StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited Data& o)
101 : RefCounted<StyleRareNonInheritedData>() 102 : RefCounted<StyleRareNonInheritedData>()
102 , opacity(o.opacity) 103 , opacity(o.opacity)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 , m_effectiveBlendMode(o.m_effectiveBlendMode) 165 , m_effectiveBlendMode(o.m_effectiveBlendMode)
165 , m_touchAction(o.m_touchAction) 166 , m_touchAction(o.m_touchAction)
166 , m_objectFit(o.m_objectFit) 167 , m_objectFit(o.m_objectFit)
167 , m_isolation(o.m_isolation) 168 , m_isolation(o.m_isolation)
168 , m_justifyItems(o.m_justifyItems) 169 , m_justifyItems(o.m_justifyItems)
169 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) 170 , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment)
170 , m_justifyItemsPositionType(o.m_justifyItemsPositionType) 171 , m_justifyItemsPositionType(o.m_justifyItemsPositionType)
171 , m_justifySelf(o.m_justifySelf) 172 , m_justifySelf(o.m_justifySelf)
172 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) 173 , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
173 , m_scrollBehavior(o.m_scrollBehavior) 174 , m_scrollBehavior(o.m_scrollBehavior)
175 , m_scrollBlocksOn(o.m_scrollBlocksOn)
174 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons) 176 , m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAccelerated CompositingForExternalReasons)
175 , m_hasInlineTransform(o.m_hasInlineTransform) 177 , m_hasInlineTransform(o.m_hasInlineTransform)
176 , m_resize(o.m_resize) 178 , m_resize(o.m_resize)
177 { 179 {
178 } 180 }
179 181
180 StyleRareNonInheritedData::~StyleRareNonInheritedData() 182 StyleRareNonInheritedData::~StyleRareNonInheritedData()
181 { 183 {
182 const FilterOperations& filterOperations = m_filter->m_operations; 184 const FilterOperations& filterOperations = m_filter->m_operations;
183 for (unsigned i = 0; i < filterOperations.size(); ++i) 185 for (unsigned i = 0; i < filterOperations.size(); ++i)
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 && m_effectiveBlendMode == o.m_effectiveBlendMode 251 && m_effectiveBlendMode == o.m_effectiveBlendMode
250 && m_touchAction == o.m_touchAction 252 && m_touchAction == o.m_touchAction
251 && m_objectFit == o.m_objectFit 253 && m_objectFit == o.m_objectFit
252 && m_isolation == o.m_isolation 254 && m_isolation == o.m_isolation
253 && m_justifyItems == o.m_justifyItems 255 && m_justifyItems == o.m_justifyItems
254 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment 256 && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment
255 && m_justifyItemsPositionType == o.m_justifyItemsPositionType 257 && m_justifyItemsPositionType == o.m_justifyItemsPositionType
256 && m_justifySelf == o.m_justifySelf 258 && m_justifySelf == o.m_justifySelf
257 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment 259 && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment
258 && m_scrollBehavior == o.m_scrollBehavior 260 && m_scrollBehavior == o.m_scrollBehavior
261 && m_scrollBlocksOn == o.m_scrollBlocksOn
259 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons 262 && m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcc eleratedCompositingForExternalReasons
260 && m_hasInlineTransform == o.m_hasInlineTransform 263 && m_hasInlineTransform == o.m_hasInlineTransform
261 && m_resize == o.m_resize; 264 && m_resize == o.m_resize;
262 } 265 }
263 266
264 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const 267 bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInherite dData& o) const
265 { 268 {
266 ContentData* a = m_content.get(); 269 ContentData* a = m_content.get();
267 ContentData* b = o.m_content.get(); 270 ContentData* b = o.m_content.get();
268 271
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 { 319 {
317 return dataEquivalent(m_shapeOutside, o.m_shapeOutside); 320 return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
318 } 321 }
319 322
320 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const 323 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInherit edData& o) const
321 { 324 {
322 return dataEquivalent(m_clipPath, o.m_clipPath); 325 return dataEquivalent(m_clipPath, o.m_clipPath);
323 } 326 }
324 327
325 } // namespace blink 328 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698