[svg2] Make 'x' and 'y' presentation attributes

Source/core/layout/style/SVGLayoutStyle.cpp

 /*
     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.
@@ skipping 22 matching lines @@
 
 SVGLayoutStyle::SVGLayoutStyle()
 {
     static SVGLayoutStyle* defaultStyle = new SVGLayoutStyle(CreateDefault);
 
     fill = defaultStyle->fill;
     stroke = defaultStyle->stroke;
     stops = defaultStyle->stops;
     misc = defaultStyle->misc;
     inheritedResources = defaultStyle->inheritedResources;
+    layout = defaultStyle->layout;
     resources = defaultStyle->resources;
 
     setBitDefaults();
 }
 
 SVGLayoutStyle::SVGLayoutStyle(CreateDefaultType)
 {
     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
@@ skipping 10 matching lines @@
     inheritedResources = svgInheritParent->inheritedResources;
 
     svg_inherited_flags = svgInheritParent->svg_inherited_flags;
 }
 
 void SVGLayoutStyle::copyNonInheritedFrom(const SVGLayoutStyle* other)
 {
     svg_noninherited_flags = other->svg_noninherited_flags;
     stops = other->stops;
     misc = other->misc;
+    layout = other->layout;
     resources = other->resources;
 }
 
 StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const
 {
     StyleDifference styleDifference;
 
     if (diffNeedsLayoutAndPaintInvalidation(other)) {
         styleDifference.setNeedsFullLayout();
         styleDifference.setNeedsPaintInvalidationObject();
@@ skipping 45 matching lines @@
             || 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 and y properties require a re-layout.
+    if (layout.get() != other->layout.get()) {
+        if (layout->x != other->layout->x
+            || layout->y != other->layout->y)
+            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()) {
@@ skipping 36 matching lines @@
 }
 
 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const
 {
     ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
     unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 }