| Index: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| index 615e435a3c662700e1d408bff33cb648821e2e69..4f7cab3d83436b7b8722940333ee43ab3510f029 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| +++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
|
| @@ -55,6 +55,7 @@ struct SameSizeAsStyleRareInheritedData
|
| TabSize tabSize;
|
| void* variables[1];
|
| TextSizeAdjust textSizeAdjust;
|
| + UnzoomedLength unzoomedLengths[1];
|
| };
|
|
|
| static_assert(sizeof(StyleRareInheritedData) <=
|
| @@ -102,6 +103,10 @@ StyleRareInheritedData::StyleRareInheritedData()
|
| m_subtreeWillChangeContents(false),
|
| m_selfOrAncestorHasDirAutoAttribute(false),
|
| m_respectImageOrientation(false),
|
| + paintOrder(ComputedStyle::initialPaintOrder()),
|
| + capStyle(ComputedStyle::initialCapStyle()),
|
| + joinStyle(ComputedStyle::initialJoinStyle()),
|
| + strokeWidth(ComputedStyle::initialStrokeWidth()),
|
| hyphenationLimitBefore(-1),
|
| hyphenationLimitAfter(-1),
|
| hyphenationLimitLines(-1),
|
| @@ -168,6 +173,10 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
|
| m_selfOrAncestorHasDirAutoAttribute(
|
| o.m_selfOrAncestorHasDirAutoAttribute),
|
| m_respectImageOrientation(o.m_respectImageOrientation),
|
| + paintOrder(o.paintOrder),
|
| + capStyle(o.capStyle),
|
| + joinStyle(o.joinStyle),
|
| + strokeWidth(o.strokeWidth),
|
| hyphenationString(o.hyphenationString),
|
| hyphenationLimitBefore(o.hyphenationLimitBefore),
|
| hyphenationLimitAfter(o.hyphenationLimitAfter),
|
| @@ -239,7 +248,9 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const {
|
| m_imageRendering == o.m_imageRendering &&
|
| m_textUnderlinePosition == o.m_textUnderlinePosition &&
|
| m_textDecorationSkip == o.m_textDecorationSkip &&
|
| - m_rubyPosition == o.m_rubyPosition &&
|
| + m_rubyPosition == o.m_rubyPosition && paintOrder == o.paintOrder &&
|
| + capStyle == o.capStyle && joinStyle == o.joinStyle &&
|
| + strokeWidth == o.strokeWidth &&
|
| dataEquivalent(listStyleImage.get(), o.listStyleImage.get()) &&
|
| dataEquivalent(appliedTextDecorations, o.appliedTextDecorations) &&
|
| dataEquivalent(variables, o.variables) &&
|
|
|