| Index: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp
|
| index 122d3b75b7cca2322dca1804c5d333cc12482544..affed4b00ae5817246b6b4a5818424def708b677 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp
|
| +++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp
|
| @@ -57,7 +57,7 @@ public:
|
| StyleContentAlignmentData contentAlignmentData[2];
|
| StyleSelfAlignmentData selfAlignmentData[4];
|
|
|
| - unsigned m_bitFields[2];
|
| + unsigned m_bitFields[3];
|
| };
|
|
|
| static_assert(sizeof(StyleRareNonInheritedData) == sizeof(SameSizeStyleRareNonInheritedData), "StyleRareNonInheritedData_should_stay_small");
|
| @@ -122,6 +122,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
|
| , m_hasCompositorProxy(false)
|
| , m_hasAuthorBackground(false)
|
| , m_hasAuthorBorder(false)
|
| + , m_snapWidth(0)
|
| {
|
| m_maskBoxImage.setMaskDefaults();
|
| }
|
| @@ -204,6 +205,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
|
| , m_hasCompositorProxy(o.m_hasCompositorProxy)
|
| , m_hasAuthorBackground(o.m_hasAuthorBackground)
|
| , m_hasAuthorBorder(o.m_hasAuthorBorder)
|
| + , m_snapWidth(o.m_snapWidth)
|
| {
|
| }
|
|
|
| @@ -285,7 +287,8 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
|
| && m_resize == o.m_resize
|
| && m_hasCompositorProxy == o.m_hasCompositorProxy
|
| && m_hasAuthorBackground == o.m_hasAuthorBackground
|
| - && m_hasAuthorBorder == o.m_hasAuthorBorder;
|
| + && m_hasAuthorBorder == o.m_hasAuthorBorder
|
| + && m_snapWidth == o.m_snapWidth;
|
| }
|
|
|
| bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
|
|
|