| Index: Source/core/layout/style/StyleRareNonInheritedData.cpp
|
| diff --git a/Source/core/layout/style/StyleRareNonInheritedData.cpp b/Source/core/layout/style/StyleRareNonInheritedData.cpp
|
| index b5270c0e12f9a0d28bd24f4ede5b6e266aacda7f..228bda5e87fa6f6c94c8c1dc5282a232b1487c93 100644
|
| --- a/Source/core/layout/style/StyleRareNonInheritedData.cpp
|
| +++ b/Source/core/layout/style/StyleRareNonInheritedData.cpp
|
| @@ -24,7 +24,7 @@
|
|
|
| #include "core/layout/style/ContentData.h"
|
| #include "core/layout/style/DataEquivalency.h"
|
| -#include "core/layout/style/LayoutStyle.h"
|
| +#include "core/layout/style/ComputedStyle.h"
|
| #include "core/layout/style/ShadowList.h"
|
| #include "core/layout/style/StyleFilterData.h"
|
| #include "core/layout/style/StyleTransformData.h"
|
| @@ -33,69 +33,69 @@
|
| namespace blink {
|
|
|
| StyleRareNonInheritedData::StyleRareNonInheritedData()
|
| - : opacity(LayoutStyle::initialOpacity())
|
| - , m_perspective(LayoutStyle::initialPerspective())
|
| - , m_perspectiveOrigin(LayoutStyle::initialPerspectiveOrigin())
|
| - , lineClamp(LayoutStyle::initialLineClamp())
|
| + : opacity(ComputedStyle::initialOpacity())
|
| + , m_perspective(ComputedStyle::initialPerspective())
|
| + , m_perspectiveOrigin(ComputedStyle::initialPerspectiveOrigin())
|
| + , lineClamp(ComputedStyle::initialLineClamp())
|
| , m_draggableRegionMode(DraggableRegionNone)
|
| , m_mask(MaskFillLayer, true)
|
| , m_pageSize()
|
| - , m_shapeOutside(LayoutStyle::initialShapeOutside())
|
| - , m_shapeMargin(LayoutStyle::initialShapeMargin())
|
| - , m_shapeImageThreshold(LayoutStyle::initialShapeImageThreshold())
|
| - , m_clipPath(LayoutStyle::initialClipPath())
|
| + , m_shapeOutside(ComputedStyle::initialShapeOutside())
|
| + , m_shapeMargin(ComputedStyle::initialShapeMargin())
|
| + , m_shapeImageThreshold(ComputedStyle::initialShapeImageThreshold())
|
| + , m_clipPath(ComputedStyle::initialClipPath())
|
| , m_textDecorationColor(StyleColor::currentColor())
|
| , m_visitedLinkTextDecorationColor(StyleColor::currentColor())
|
| - , m_visitedLinkBackgroundColor(LayoutStyle::initialBackgroundColor())
|
| + , 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_order(LayoutStyle::initialOrder())
|
| - , m_objectPosition(LayoutStyle::initialObjectPosition())
|
| + , m_order(ComputedStyle::initialOrder())
|
| + , m_objectPosition(ComputedStyle::initialObjectPosition())
|
| , m_pageSizeType(PAGE_SIZE_AUTO)
|
| - , m_transformStyle3D(LayoutStyle::initialTransformStyle3D())
|
| - , m_backfaceVisibility(LayoutStyle::initialBackfaceVisibility())
|
| - , m_alignContent(LayoutStyle::initialAlignContent())
|
| - , m_alignContentDistribution(LayoutStyle::initialAlignContentDistribution())
|
| - , m_alignContentOverflowAlignment(LayoutStyle::initialAlignContentOverflowAlignment())
|
| - , m_alignItems(LayoutStyle::initialAlignItems())
|
| - , m_alignItemsOverflowAlignment(LayoutStyle::initialAlignItemsOverflowAlignment())
|
| - , m_alignSelf(LayoutStyle::initialAlignSelf())
|
| - , m_alignSelfOverflowAlignment(LayoutStyle::initialAlignSelfOverflowAlignment())
|
| - , m_justifyContent(LayoutStyle::initialJustifyContent())
|
| - , m_justifyContentDistribution(LayoutStyle::initialJustifyContentDistribution())
|
| - , m_justifyContentOverflowAlignment(LayoutStyle::initialJustifyContentOverflowAlignment())
|
| - , userDrag(LayoutStyle::initialUserDrag())
|
| - , textOverflow(LayoutStyle::initialTextOverflow())
|
| + , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
|
| + , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
|
| + , m_alignContent(ComputedStyle::initialAlignContent())
|
| + , m_alignContentDistribution(ComputedStyle::initialAlignContentDistribution())
|
| + , m_alignContentOverflowAlignment(ComputedStyle::initialAlignContentOverflowAlignment())
|
| + , m_alignItems(ComputedStyle::initialAlignItems())
|
| + , m_alignItemsOverflowAlignment(ComputedStyle::initialAlignItemsOverflowAlignment())
|
| + , m_alignSelf(ComputedStyle::initialAlignSelf())
|
| + , m_alignSelfOverflowAlignment(ComputedStyle::initialAlignSelfOverflowAlignment())
|
| + , m_justifyContent(ComputedStyle::initialJustifyContent())
|
| + , m_justifyContentDistribution(ComputedStyle::initialJustifyContentDistribution())
|
| + , m_justifyContentOverflowAlignment(ComputedStyle::initialJustifyContentOverflowAlignment())
|
| + , userDrag(ComputedStyle::initialUserDrag())
|
| + , textOverflow(ComputedStyle::initialTextOverflow())
|
| , marginBeforeCollapse(MCOLLAPSE)
|
| , marginAfterCollapse(MCOLLAPSE)
|
| - , m_appearance(LayoutStyle::initialAppearance())
|
| - , m_textCombine(LayoutStyle::initialTextCombine())
|
| - , m_textDecorationStyle(LayoutStyle::initialTextDecorationStyle())
|
| - , m_wrapFlow(LayoutStyle::initialWrapFlow())
|
| - , m_wrapThrough(LayoutStyle::initialWrapThrough())
|
| + , m_appearance(ComputedStyle::initialAppearance())
|
| + , m_textCombine(ComputedStyle::initialTextCombine())
|
| + , m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle())
|
| + , m_wrapFlow(ComputedStyle::initialWrapFlow())
|
| + , m_wrapThrough(ComputedStyle::initialWrapThrough())
|
| , m_hasCurrentOpacityAnimation(false)
|
| , m_hasCurrentTransformAnimation(false)
|
| , m_hasCurrentFilterAnimation(false)
|
| , m_runningOpacityAnimationOnCompositor(false)
|
| , m_runningTransformAnimationOnCompositor(false)
|
| , m_runningFilterAnimationOnCompositor(false)
|
| - , m_effectiveBlendMode(LayoutStyle::initialBlendMode())
|
| - , m_touchAction(LayoutStyle::initialTouchAction())
|
| - , m_objectFit(LayoutStyle::initialObjectFit())
|
| - , m_isolation(LayoutStyle::initialIsolation())
|
| - , m_justifyItems(LayoutStyle::initialJustifyItems())
|
| - , m_justifyItemsOverflowAlignment(LayoutStyle::initialJustifyItemsOverflowAlignment())
|
| - , m_justifyItemsPositionType(LayoutStyle::initialJustifyItemsPositionType())
|
| - , m_justifySelf(LayoutStyle::initialJustifySelf())
|
| - , m_justifySelfOverflowAlignment(LayoutStyle::initialJustifySelfOverflowAlignment())
|
| - , m_scrollBehavior(LayoutStyle::initialScrollBehavior())
|
| - , m_scrollBlocksOn(LayoutStyle::initialScrollBlocksOn())
|
| + , m_effectiveBlendMode(ComputedStyle::initialBlendMode())
|
| + , m_touchAction(ComputedStyle::initialTouchAction())
|
| + , m_objectFit(ComputedStyle::initialObjectFit())
|
| + , m_isolation(ComputedStyle::initialIsolation())
|
| + , m_justifyItems(ComputedStyle::initialJustifyItems())
|
| + , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflowAlignment())
|
| + , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType())
|
| + , m_justifySelf(ComputedStyle::initialJustifySelf())
|
| + , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAlignment())
|
| + , m_scrollBehavior(ComputedStyle::initialScrollBehavior())
|
| + , m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
|
| , m_requiresAcceleratedCompositingForExternalReasons(false)
|
| , m_hasInlineTransform(false)
|
| - , m_resize(LayoutStyle::initialResize())
|
| + , m_resize(ComputedStyle::initialResize())
|
| {
|
| m_maskBoxImage.setMaskDefaults();
|
| }
|
|
|