| Index: Source/core/layout/style/SVGLayoutStyle.cpp
|
| diff --git a/Source/core/layout/style/SVGLayoutStyle.cpp b/Source/core/layout/style/SVGLayoutStyle.cpp
|
| deleted file mode 100644
|
| index 10eef96ce1a7e95c2e015297f2ce8a5d4afe9f44..0000000000000000000000000000000000000000
|
| --- a/Source/core/layout/style/SVGLayoutStyle.cpp
|
| +++ /dev/null
|
| @@ -1,258 +0,0 @@
|
| -/*
|
| - Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
|
| - 2004, 2005, 2010 Rob Buis <buis@kde.org>
|
| - Copyright (C) Research In Motion Limited 2010. All rights reserved.
|
| -
|
| - Based on khtml code by:
|
| - Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
|
| - Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
|
| - Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
|
| - Copyright (C) 2002 Apple Computer, Inc.
|
| -
|
| - 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,
|
| - but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
| - Library General Public License for more details.
|
| -
|
| - You should have received a copy of the GNU Library General Public License
|
| - along with this library; see the file COPYING.LIB. If not, write to
|
| - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
| - Boston, MA 02110-1301, USA.
|
| -*/
|
| -
|
| -#include "config.h"
|
| -
|
| -#include "core/layout/style/SVGLayoutStyle.h"
|
| -
|
| -namespace blink {
|
| -
|
| -SVGLayoutStyle::SVGLayoutStyle()
|
| -{
|
| - static SVGLayoutStyle* initialStyle = new SVGLayoutStyle(CreateInitial);
|
| -
|
| - fill = initialStyle->fill;
|
| - stroke = initialStyle->stroke;
|
| - stops = initialStyle->stops;
|
| - misc = initialStyle->misc;
|
| - inheritedResources = initialStyle->inheritedResources;
|
| - layout = initialStyle->layout;
|
| - resources = initialStyle->resources;
|
| -
|
| - setBitDefaults();
|
| -}
|
| -
|
| -SVGLayoutStyle::SVGLayoutStyle(CreateInitialType)
|
| -{
|
| - setBitDefaults();
|
| -
|
| - fill.init();
|
| - stroke.init();
|
| - stops.init();
|
| - misc.init();
|
| - inheritedResources.init();
|
| - layout.init();
|
| - resources.init();
|
| -}
|
| -
|
| -SVGLayoutStyle::SVGLayoutStyle(const SVGLayoutStyle& other)
|
| - : RefCounted<SVGLayoutStyle>()
|
| -{
|
| - fill = other.fill;
|
| - stroke = other.stroke;
|
| - stops = other.stops;
|
| - misc = other.misc;
|
| - inheritedResources = other.inheritedResources;
|
| - layout = other.layout;
|
| - resources = other.resources;
|
| -
|
| - svg_inherited_flags = other.svg_inherited_flags;
|
| - svg_noninherited_flags = other.svg_noninherited_flags;
|
| -}
|
| -
|
| -SVGLayoutStyle::~SVGLayoutStyle()
|
| -{
|
| -}
|
| -
|
| -bool SVGLayoutStyle::operator==(const SVGLayoutStyle& other) const
|
| -{
|
| - return fill == other.fill
|
| - && stroke == other.stroke
|
| - && stops == other.stops
|
| - && misc == other.misc
|
| - && inheritedResources == other.inheritedResources
|
| - && layout == other.layout
|
| - && resources == other.resources
|
| - && svg_inherited_flags == other.svg_inherited_flags
|
| - && svg_noninherited_flags == other.svg_noninherited_flags;
|
| -}
|
| -
|
| -bool SVGLayoutStyle::inheritedNotEqual(const SVGLayoutStyle* other) const
|
| -{
|
| - return fill != other->fill
|
| - || stroke != other->stroke
|
| - || inheritedResources != other->inheritedResources
|
| - || svg_inherited_flags != other->svg_inherited_flags;
|
| -}
|
| -
|
| -void SVGLayoutStyle::inheritFrom(const SVGLayoutStyle* svgInheritParent)
|
| -{
|
| - if (!svgInheritParent)
|
| - return;
|
| -
|
| - fill = svgInheritParent->fill;
|
| - stroke = svgInheritParent->stroke;
|
| - inheritedResources = svgInheritParent->inheritedResources;
|
| -
|
| - svg_inherited_flags = svgInheritParent->svg_inherited_flags;
|
| -}
|
| -
|
| -void SVGLayoutStyle::copyNonInheritedFromCached(const SVGLayoutStyle* other)
|
| -{
|
| - svg_noninherited_flags = other->svg_noninherited_flags;
|
| - stops = other->stops;
|
| - misc = other->misc;
|
| - layout = other->layout;
|
| - resources = other->resources;
|
| -}
|
| -
|
| -PassRefPtr<SVGDashArray> SVGLayoutStyle::initialStrokeDashArray()
|
| -{
|
| - DEFINE_STATIC_REF(SVGDashArray, initialDashArray, SVGDashArray::create());
|
| - return initialDashArray;
|
| -}
|
| -
|
| -StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const
|
| -{
|
| - StyleDifference styleDifference;
|
| -
|
| - if (diffNeedsLayoutAndPaintInvalidation(other)) {
|
| - styleDifference.setNeedsFullLayout();
|
| - styleDifference.setNeedsPaintInvalidationObject();
|
| - } else if (diffNeedsPaintInvalidation(other)) {
|
| - styleDifference.setNeedsPaintInvalidationObject();
|
| - }
|
| -
|
| - return styleDifference;
|
| -}
|
| -
|
| -bool SVGLayoutStyle::diffNeedsLayoutAndPaintInvalidation(const SVGLayoutStyle* other) const
|
| -{
|
| - // If resources change, we need a relayout, as the presence of resources influences the paint invalidation rect.
|
| - if (resources != other->resources)
|
| - return true;
|
| -
|
| - // If markers change, we need a relayout, as marker boundaries are cached in LayoutSVGPath.
|
| - if (inheritedResources != other->inheritedResources)
|
| - return true;
|
| -
|
| - // All text related properties influence layout.
|
| - if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAnchor
|
| - || svg_inherited_flags._writingMode != other->svg_inherited_flags._writingMode
|
| - || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherited_flags._glyphOrientationHorizontal
|
| - || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited_flags._glyphOrientationVertical
|
| - || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherited_flags.f._alignmentBaseline
|
| - || svg_noninherited_flags.f._dominantBaseline != other->svg_noninherited_flags.f._dominantBaseline
|
| - || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_flags.f._baselineShift)
|
| - return true;
|
| -
|
| - // Text related properties influence layout.
|
| - if (misc->baselineShiftValue != other->misc->baselineShiftValue)
|
| - return true;
|
| -
|
| - // These properties affect the cached stroke bounding box rects.
|
| - if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle
|
| - || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinStyle)
|
| - return true;
|
| -
|
| - // vector-effect changes require a re-layout.
|
| - if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
|
| - return true;
|
| -
|
| - // Some stroke properties, requires relayouts, as the cached stroke boundaries need to be recalculated.
|
| - if (stroke.get() != other->stroke.get()) {
|
| - if (stroke->width != other->stroke->width
|
| - || stroke->paintType != other->stroke->paintType
|
| - || stroke->paintColor != other->stroke->paintColor
|
| - || stroke->paintUri != other->stroke->paintUri
|
| - || stroke->miterLimit != other->stroke->miterLimit
|
| - || *stroke->dashArray != *other->stroke->dashArray
|
| - || stroke->dashOffset != other->stroke->dashOffset
|
| - || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintColor
|
| - || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri
|
| - || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintType)
|
| - return true;
|
| - }
|
| -
|
| - // The x, y, rx and ry properties require a re-layout.
|
| - if (layout.get() != other->layout.get()) {
|
| - if (layout->x != other->layout->x
|
| - || layout->y != other->layout->y
|
| - || layout->r != other->layout->r
|
| - || layout->rx != other->layout->rx
|
| - || layout->ry != other->layout->ry
|
| - || layout->cx != other->layout->cx
|
| - || layout->cy != other->layout->cy)
|
| - return true;
|
| - }
|
| -
|
| - return false;
|
| -}
|
| -
|
| -bool SVGLayoutStyle::diffNeedsPaintInvalidation(const SVGLayoutStyle* other) const
|
| -{
|
| - if (stroke->opacity != other->stroke->opacity)
|
| - return true;
|
| -
|
| - // Painting related properties only need paint invalidation.
|
| - if (misc.get() != other->misc.get()) {
|
| - if (misc->floodColor != other->misc->floodColor
|
| - || misc->floodOpacity != other->misc->floodOpacity
|
| - || misc->lightingColor != other->misc->lightingColor)
|
| - return true;
|
| - }
|
| -
|
| - // If fill changes, we just need to issue paint invalidations. Fill boundaries are not influenced by this, only by the Path, that LayoutSVGPath contains.
|
| - if (fill.get() != other->fill.get()) {
|
| - if (fill->paintType != other->fill->paintType
|
| - || fill->paintColor != other->fill->paintColor
|
| - || fill->paintUri != other->fill->paintUri
|
| - || fill->opacity != other->fill->opacity)
|
| - return true;
|
| - }
|
| -
|
| - // If gradient stops change, we just need to issue paint invalidations. Style updates are already handled through LayoutSVGGradientSTop.
|
| - if (stops != other->stops)
|
| - return true;
|
| -
|
| - // Changes of these flags only cause paint invalidations.
|
| - if (svg_inherited_flags._colorRendering != other->svg_inherited_flags._colorRendering
|
| - || svg_inherited_flags._shapeRendering != other->svg_inherited_flags._shapeRendering
|
| - || svg_inherited_flags._clipRule != other->svg_inherited_flags._clipRule
|
| - || svg_inherited_flags._fillRule != other->svg_inherited_flags._fillRule
|
| - || svg_inherited_flags._colorInterpolation != other->svg_inherited_flags._colorInterpolation
|
| - || svg_inherited_flags._colorInterpolationFilters != other->svg_inherited_flags._colorInterpolationFilters
|
| - || svg_inherited_flags._paintOrder != other->svg_inherited_flags._paintOrder)
|
| - return true;
|
| -
|
| - if (svg_noninherited_flags.f.bufferedRendering != other->svg_noninherited_flags.f.bufferedRendering)
|
| - return true;
|
| -
|
| - if (svg_noninherited_flags.f.maskType != other->svg_noninherited_flags.f.maskType)
|
| - return true;
|
| -
|
| - return false;
|
| -}
|
| -
|
| -EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const
|
| -{
|
| - ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
|
| - unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
|
| - return (EPaintOrderType)pt;
|
| -}
|
| -
|
| -}
|
|
|