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

Unified Diff: Source/core/style/StyleRareNonInheritedData.cpp

Issue 1148873005: Parsing CSS properties for scroll snap points (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix comment Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/style/StyleRareNonInheritedData.h ('k') | Source/core/style/StyleScrollSnapData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/style/StyleRareNonInheritedData.cpp b/Source/core/style/StyleRareNonInheritedData.cpp
index bd64a7508e790319f33ec8b2a5ef499d67552f9c..384660f1d6743695586fbbf9fd5dfee5005e851e 100644
--- a/Source/core/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/style/StyleRareNonInheritedData.cpp
@@ -41,7 +41,7 @@ public:
LineClampValue lineClamps;
DraggableRegionMode draggableRegions;
- void* dataRefs[8];
+ void* dataRefs[9];
void* ownPtrs[4];
void* refPtrs[4];
@@ -114,6 +114,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_isolation(ComputedStyle::initialIsolation())
, m_scrollBehavior(ComputedStyle::initialScrollBehavior())
, m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
+ , m_scrollSnapType(ComputedStyle::initialScrollSnapType())
, m_requiresAcceleratedCompositingForExternalReasons(false)
, m_hasInlineTransform(false)
, m_resize(ComputedStyle::initialResize())
@@ -140,6 +141,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_filter(o.m_filter)
, m_grid(o.m_grid)
, m_gridItem(o.m_gridItem)
+ , m_scrollSnap(o.m_scrollSnap)
, m_content(o.m_content ? o.m_content->clone() : nullptr)
, m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
, m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
@@ -190,6 +192,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_isolation(o.m_isolation)
, m_scrollBehavior(o.m_scrollBehavior)
, m_scrollBlocksOn(o.m_scrollBlocksOn)
+ , m_scrollSnapType(o.m_scrollSnapType)
, m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAcceleratedCompositingForExternalReasons)
, m_hasInlineTransform(o.m_hasInlineTransform)
, m_resize(o.m_resize)
@@ -222,6 +225,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_filter == o.m_filter
&& m_grid == o.m_grid
&& m_gridItem == o.m_gridItem
+ && m_scrollSnap == o.m_scrollSnap
&& contentDataEquivalent(o)
&& counterDataEquivalent(o)
&& shadowDataEquivalent(o)
@@ -270,6 +274,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_isolation == o.m_isolation
&& m_scrollBehavior == o.m_scrollBehavior
&& m_scrollBlocksOn == o.m_scrollBlocksOn
+ && m_scrollBlocksOn == o.m_scrollSnapType
&& m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcceleratedCompositingForExternalReasons
&& m_hasInlineTransform == o.m_hasInlineTransform
&& m_resize == o.m_resize
« no previous file with comments | « Source/core/style/StyleRareNonInheritedData.h ('k') | Source/core/style/StyleScrollSnapData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698