CSS Properties and Values API: Support non-inherited custom properties

third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 10 matching lines @@
 
 #include "core/style/StyleRareNonInheritedData.h"
 
 #include "core/animation/css/CSSAnimationData.h"
 #include "core/animation/css/CSSTransitionData.h"
 #include "core/style/ContentData.h"
 #include "core/style/DataEquivalency.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/ShadowList.h"
 #include "core/style/StyleFilterData.h"
+#include "core/style/StyleNonInheritedVariables.h"
 #include "core/style/StyleTransformData.h"
 #include "core/layout/svg/ReferenceFilterBuilder.h"
 
 namespace blink {
 
 class SameSizeStyleRareNonInheritedData : public RefCounted<StyleRareNonInheritedData> {
 public:
     float floats[3];
     int integers;
 
     LengthPoint lengthPoints[2];
     LineClampValue lineClamps;
     DraggableRegionMode draggableRegions;
 
     void* dataRefs[8];
     DataPersistent<void*> dataPersistents[2];
     void* ownPtrs[4];
     Persistent<void*> persistentHandles[2];
-    void* refPtrs[2];
+    void* refPtrs[3];
     void* uniquePtrs[1];
 
     FillLayer fillLayers;
     NinePieceImage ninePieces;
     FloatSize floatSize;
     Length lengths;
 
     StyleColor styleColors[8];
 
     Vector<String> m_callbackSelectors;
@@ skipping 21 matching lines @@
     , m_pageSize()
     , m_shapeMargin(ComputedStyle::initialShapeMargin())
     , m_textDecorationColor(StyleColor::currentColor())
     , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
     , m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor())
     , m_visitedLinkOutlineColor(StyleColor::currentColor())
     , m_visitedLinkBorderLeftColor(StyleColor::currentColor())
     , m_visitedLinkBorderRightColor(StyleColor::currentColor())
     , m_visitedLinkBorderTopColor(StyleColor::currentColor())
     , m_visitedLinkBorderBottomColor(StyleColor::currentColor())
+    , m_variables(ComputedStyle::initialNonInheritedVariables())
     , m_alignContent(ComputedStyle::initialContentAlignment())
     , m_alignItems(ComputedStyle::initialDefaultAlignment())
     , m_alignSelf(ComputedStyle::initialSelfAlignment())
     , m_justifyContent(ComputedStyle::initialContentAlignment())
     , m_justifyItems(ComputedStyle::initialSelfAlignment())
     , m_justifySelf(ComputedStyle::initialSelfAlignment())
     , m_pageSizeType(PAGE_SIZE_AUTO)
     , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
     , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
     , userDrag(ComputedStyle::initialUserDrag())
@@ skipping 61 matching lines @@
     , m_pageSize(o.m_pageSize)
     , m_shapeMargin(o.m_shapeMargin)
     , m_textDecorationColor(o.m_textDecorationColor)
     , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
     , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
     , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
     , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
     , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
     , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
     , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
+    , m_variables(o.m_variables ? o.m_variables->copy() : nullptr)
     , m_alignContent(o.m_alignContent)
     , m_alignItems(o.m_alignItems)
     , m_alignSelf(o.m_alignSelf)
     , m_justifyContent(o.m_justifyContent)
     , m_justifyItems(o.m_justifyItems)
     , m_justifySelf(o.m_justifySelf)
     , m_pageSizeType(o.m_pageSizeType)
     , m_transformStyle3D(o.m_transformStyle3D)
     , m_backfaceVisibility(o.m_backfaceVisibility)
     , userDrag(o.userDrag)
@@ skipping 65 matching lines @@
         && clipPathDataEquivalent(o)
         && m_textDecorationColor == o.m_textDecorationColor
         && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
         && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
         && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
         && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
         && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
         && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
         && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
         && m_callbackSelectors == o.m_callbackSelectors
+        && dataEquivalent(m_variables, o.m_variables)
         && m_alignContent == o.m_alignContent
         && m_alignItems == o.m_alignItems
         && m_alignSelf == o.m_alignSelf
         && m_justifyContent == o.m_justifyContent
         && m_justifyItems == o.m_justifyItems
         && m_justifySelf == o.m_justifySelf
         && m_pageSizeType == o.m_pageSizeType
         && m_transformStyle3D == o.m_transformStyle3D
         && m_backfaceVisibility == o.m_backfaceVisibility
         && userDrag == o.userDrag
@@ skipping 82 matching lines @@
 {
     return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
 }
 
 bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInheritedData& o) const
 {
     return dataEquivalent(m_clipPath, o.m_clipPath);
 }
 
 } // namespace blink