| Index: third_party/WebKit/Source/core/style/StyleDifference.h
|
| diff --git a/third_party/WebKit/Source/core/style/StyleDifference.h b/third_party/WebKit/Source/core/style/StyleDifference.h
|
| index 6ecc0087c1c262ccd4e11c7e197dbea807587219..c9709a6e491514e1ffcfb4845922f9c7e4b5b000 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleDifference.h
|
| +++ b/third_party/WebKit/Source/core/style/StyleDifference.h
|
| @@ -33,17 +33,14 @@ class StyleDifference {
|
| : m_paintInvalidationType(NoPaintInvalidation),
|
| m_layoutType(NoLayout),
|
| m_recomputeOverflow(false),
|
| + m_visualRectUpdate(false),
|
| m_propertySpecificDifferences(0),
|
| m_scrollAnchorDisablingPropertyChanged(false) {}
|
|
|
| bool hasDifference() const {
|
| - bool result = m_paintInvalidationType || m_layoutType ||
|
| - m_propertySpecificDifferences;
|
| - // m_recomputeOverflow, m_scrollAnchorDisablingPropertyChanged and
|
| - // are never set without other flags set.
|
| - DCHECK(result ||
|
| - (!m_recomputeOverflow && !m_scrollAnchorDisablingPropertyChanged));
|
| - return result;
|
| + return m_paintInvalidationType || m_layoutType ||
|
| + m_propertySpecificDifferences || m_recomputeOverflow ||
|
| + m_visualRectUpdate || m_scrollAnchorDisablingPropertyChanged;
|
| }
|
|
|
| bool hasAtMostPropertySpecificDifferences(
|
| @@ -91,6 +88,9 @@ class StyleDifference {
|
| bool needsRecomputeOverflow() const { return m_recomputeOverflow; }
|
| void setNeedsRecomputeOverflow() { m_recomputeOverflow = true; }
|
|
|
| + bool needsVisualRectUpdate() const { return m_visualRectUpdate; }
|
| + void setNeedsVisualRectUpdate() { m_visualRectUpdate = true; }
|
| +
|
| bool transformChanged() const {
|
| return m_propertySpecificDifferences & TransformChanged;
|
| }
|
| @@ -155,6 +155,7 @@ class StyleDifference {
|
| enum LayoutType { NoLayout = 0, PositionedMovement, FullLayout };
|
| unsigned m_layoutType : 2;
|
| unsigned m_recomputeOverflow : 1;
|
| + unsigned m_visualRectUpdate : 1;
|
| unsigned m_propertySpecificDifferences : kPropertyDifferenceCount;
|
| unsigned m_scrollAnchorDisablingPropertyChanged : 1;
|
| };
|
|
|