Attachment 346524 Details for Bug 186751 – Remove SVG macros from SVGPatternElement

[patch] Remove SVG macros from SVGPatternElement

186751-73.patch (text/plain), 18.59 KB, created by Said Abou-Hallawa on 2018-08-03 12:39:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-03 12:39:25 PDT

Size: 18.59 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index edffcf24480..6584cdcbbcd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [73] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGPatternElement.
>+
>+        * svg/SVGPatternElement.cpp:
>+        (WebCore::SVGPatternElement::SVGPatternElement):
>+        (WebCore::SVGPatternElement::registerAttributes):
>+        (WebCore::SVGPatternElement::parseAttribute):
>+        (WebCore::SVGPatternElement::svgAttributeChanged):
>+        (WebCore::SVGPatternElement::collectPatternAttributes const):
>+        (WebCore::SVGPatternElement::isSupportedAttribute): Deleted.
>+        (WebCore::SVGPatternElement::requiredFeatures): Deleted.
>+        (WebCore::SVGPatternElement::requiredExtensions): Deleted.
>+        (WebCore::SVGPatternElement::systemLanguage): Deleted.
>+        * svg/SVGPatternElement.h:
>+
> 2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [72] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGFitToViewBox.cpp b/Source/WebCore/svg/SVGFitToViewBox.cpp
>index 321de6d950d..e49242a26a9 100644
>--- a/Source/WebCore/svg/SVGFitToViewBox.cpp
>+++ b/Source/WebCore/svg/SVGFitToViewBox.cpp
>@@ -115,18 +115,21 @@ bool SVGFitToViewBox::parseViewBox(const UChar*& c, const UChar* end, FloatRect&
>             return false;
>         }
> 
>-        if (width < 0.0) { // check that width is positive
>+        // Check that width is positive.
>+        if (width < 0.0) {
>             document.accessSVGExtensions().reportError("A negative value for ViewBox width is not allowed");
>             return false;
>         }
> 
>-        if (height < 0.0) { // check that height is positive
>+        // Check that height is positive.
>+        if (height < 0.0) {
>             document.accessSVGExtensions().reportError("A negative value for ViewBox height is not allowed");
>             return false;
>         }
> 
>+        // Nothing should come after the last, fourth number.
>         skipOptionalSVGSpaces(c, end);
>-        if (c < end) { // nothing should come after the last, fourth number
>+        if (c < end) {
>             document.accessSVGExtensions().reportWarning("Problem parsing viewBox=\"" + str + "\"");
>             return false;
>         }
>diff --git a/Source/WebCore/svg/SVGLangSpace.cpp b/Source/WebCore/svg/SVGLangSpace.cpp
>index f0975afadb5..c3fbd06af09 100644
>--- a/Source/WebCore/svg/SVGLangSpace.cpp
>+++ b/Source/WebCore/svg/SVGLangSpace.cpp
>@@ -22,9 +22,9 @@
> #include "config.h"
> #include "SVGLangSpace.h"
> 
>-#include "SVGElement.h"
>-#include "RenderSVGShape.h"
> #include "RenderSVGResource.h"
>+#include "RenderSVGShape.h"
>+#include "SVGElement.h"
> #include "XMLNames.h"
> #include <wtf/NeverDestroyed.h>
> 
>diff --git a/Source/WebCore/svg/SVGPatternElement.cpp b/Source/WebCore/svg/SVGPatternElement.cpp
>index 09037d75af4..81b0af66c90 100644
>--- a/Source/WebCore/svg/SVGPatternElement.cpp
>+++ b/Source/WebCore/svg/SVGPatternElement.cpp
>@@ -3,6 +3,7 @@
>  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
>  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
>  * Copyright (C) 2014 Adobe Systems Incorporated. All rights reserved.
>+ * Copyright (C) 2018 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
>@@ -45,46 +46,15 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGPatternElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::xAttr, X, x)
>-DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::yAttr, Y, y)
>-DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::widthAttr, Width, width)
>-DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::heightAttr, Height, height)
>-DEFINE_ANIMATED_ENUMERATION(SVGPatternElement, SVGNames::patternUnitsAttr, PatternUnits, patternUnits, SVGUnitTypes::SVGUnitType)
>-DEFINE_ANIMATED_ENUMERATION(SVGPatternElement, SVGNames::patternContentUnitsAttr, PatternContentUnits, patternContentUnits, SVGUnitTypes::SVGUnitType)
>-DEFINE_ANIMATED_TRANSFORM_LIST(SVGPatternElement, SVGNames::patternTransformAttr, PatternTransform, patternTransform) 
>-DEFINE_ANIMATED_STRING(SVGPatternElement, XLinkNames::hrefAttr, Href, href)
>-DEFINE_ANIMATED_BOOLEAN(SVGPatternElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-DEFINE_ANIMATED_RECT(SVGPatternElement, SVGNames::viewBoxAttr, ViewBox, viewBox)
>-DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGPatternElement, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio) 
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGPatternElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(width)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(height)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(patternUnits)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(patternContentUnits)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(patternTransform)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(viewBox)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio) 
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGElement)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGPatternElement::SVGPatternElement(const QualifiedName& tagName, Document& document)
>     : SVGElement(tagName, document)
>-    , m_x(LengthModeWidth)
>-    , m_y(LengthModeHeight)
>-    , m_width(LengthModeWidth)
>-    , m_height(LengthModeHeight)
>-    , m_patternUnits(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
>-    , m_patternContentUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
>+    , SVGURIReference(*this)
>+    , SVGTests(*this)
>+    , SVGExternalResourcesRequired(*this)
>+    , SVGFitToViewBox(*this)
> {
>     ASSERT(hasTagName(SVGNames::patternTag));
>-    registerAnimatedPropertiesForSVGPatternElement();
>+    registerAttributes();
> }
> 
> Ref<SVGPatternElement> SVGPatternElement::create(const QualifiedName& tagName, Document& document)
>@@ -92,22 +62,18 @@ Ref<SVGPatternElement> SVGPatternElement::create(const QualifiedName& tagName, D
>     return adoptRef(*new SVGPatternElement(tagName, document));
> }
> 
>-bool SVGPatternElement::isSupportedAttribute(const QualifiedName& attrName)
>+void SVGPatternElement::registerAttributes()
> {
>-    static const auto supportedAttributes = makeNeverDestroyed([] {
>-        HashSet<QualifiedName> set;
>-        SVGURIReference::addSupportedAttributes(set);
>-        SVGTests::addSupportedAttributes(set);
>-        SVGLangSpace::addSupportedAttributes(set);
>-        SVGExternalResourcesRequired::addSupportedAttributes(set);
>-        SVGFitToViewBox::addSupportedAttributes(set);
>-        set.add({
>-            SVGNames::patternUnitsAttr.get(), SVGNames::patternContentUnitsAttr.get(), SVGNames::patternTransformAttr.get(),
>-            SVGNames::xAttr.get(), SVGNames::yAttr.get(), SVGNames::widthAttr.get(), SVGNames::heightAttr.get(),
>-        });
>-        return set;
>-    }());
>-    return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName);
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::xAttr, &SVGPatternElement::m_x>();
>+    registry.registerAttribute<SVGNames::yAttr, &SVGPatternElement::m_y>();
>+    registry.registerAttribute<SVGNames::widthAttr, &SVGPatternElement::m_width>();
>+    registry.registerAttribute<SVGNames::heightAttr, &SVGPatternElement::m_height>();
>+    registry.registerAttribute<SVGNames::patternUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGPatternElement::m_patternUnits>();
>+    registry.registerAttribute<SVGNames::patternContentUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGPatternElement::m_patternContentUnits>();
>+    registry.registerAttribute<SVGNames::patternTransformAttr, &SVGPatternElement::m_patternTransform>();
> }
> 
> void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
>@@ -115,33 +81,33 @@ void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomicSt
>     if (name == SVGNames::patternUnitsAttr) {
>         auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value);
>         if (propertyValue > 0)
>-            setPatternUnitsBaseValue(propertyValue);
>+            m_patternUnits.setValue(propertyValue);
>         return;
>     }
>     if (name == SVGNames::patternContentUnitsAttr) {
>         auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value);
>         if (propertyValue > 0)
>-            setPatternContentUnitsBaseValue(propertyValue);
>+            m_patternContentUnits.setValue(propertyValue);
>         return;
>     }
>     if (name == SVGNames::patternTransformAttr) {
>         SVGTransformListValues newList;
>         newList.parse(value);
>-        detachAnimatedPatternTransformListWrappers(newList.size());
>-        setPatternTransformBaseValue(newList);
>+        m_patternTransform.detachAnimatedListWrappers(newList.size());
>+        m_patternTransform.setValue(WTFMove(newList));
>         return;
>     }
> 
>     SVGParsingError parseError = NoError;
> 
>     if (name == SVGNames::xAttr)
>-        setXBaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>+        m_x.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>     else if (name == SVGNames::yAttr)
>-        setYBaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>+        m_y.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>     else if (name == SVGNames::widthAttr)
>-        setWidthBaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>+        m_width.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>     else if (name == SVGNames::heightAttr)
>-        setHeightBaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
>+        m_height.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
> 
>     reportAttributeParsingError(parseError, name, value);
> 
>@@ -149,28 +115,27 @@ void SVGPatternElement::parseAttribute(const QualifiedName& name, const AtomicSt
>     SVGURIReference::parseAttribute(name, value);
>     SVGTests::parseAttribute(name, value);
>     SVGExternalResourcesRequired::parseAttribute(name, value);
>-    SVGFitToViewBox::parseAttribute(this, name, value);
>+    SVGFitToViewBox::parseAttribute(name, value);
> }
> 
> void SVGPatternElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (!isSupportedAttribute(attrName)) {
>-        SVGElement::svgAttributeChanged(attrName);
>+    if (isAnimatedLengthAttribute(attrName)) {
>+        InstanceInvalidationGuard guard(*this);
>+        invalidateSVGPresentationAttributeStyle();
>         return;
>     }
> 
>-    InstanceInvalidationGuard guard(*this);
>-
>-    if (attrName == SVGNames::xAttr
>-        || attrName == SVGNames::yAttr
>-        || attrName == SVGNames::widthAttr
>-        || attrName == SVGNames::heightAttr) {
>-        invalidateSVGPresentationAttributeStyle();
>+    if (isKnownAttribute(attrName)) {
>+        if (RenderObject* object = renderer())
>+            object->setNeedsLayout();
>         return;
>     }
> 
>-    if (RenderObject* object = renderer())
>-        object->setNeedsLayout();
>+    SVGElement::svgAttributeChanged(attrName);
>+    SVGURIReferencesvgAttributeChanged(attrName);
>+    SVGExternalResourcesRequiredsvgAttributeChanged(attrName);
>+    SVGFitToViewBoxsvgAttributeChanged(attrName);
> }
> 
> void SVGPatternElement::childrenChanged(const ChildChange& change)
>@@ -203,7 +168,7 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
>     if (!attributes.hasHeight() && hasAttribute(SVGNames::heightAttr))
>         attributes.setHeight(height());
> 
>-    if (!attributes.hasViewBox() && hasAttribute(SVGNames::viewBoxAttr) && viewBoxIsValid())
>+    if (!attributes.hasViewBox() && hasAttribute(SVGNames::viewBoxAttr) && hasValidViewBox())
>         attributes.setViewBox(viewBox());
> 
>     if (!attributes.hasPreserveAspectRatio() && hasAttribute(SVGNames::preserveAspectRatioAttr))
>@@ -232,19 +197,4 @@ AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::C
>     return matrix;
> }
> 
>-Ref<SVGStringList> SVGPatternElement::requiredFeatures()
>-{
>-    return SVGTests::requiredFeatures(*this);
>-}
>-
>-Ref<SVGStringList> SVGPatternElement::requiredExtensions()
>-{ 
>-    return SVGTests::requiredExtensions(*this);
>-}
>-
>-Ref<SVGStringList> SVGPatternElement::systemLanguage()
>-{
>-    return SVGTests::systemLanguage(*this);
>-}
>-
> }
>diff --git a/Source/WebCore/svg/SVGPatternElement.h b/Source/WebCore/svg/SVGPatternElement.h
>index 6cf1aad5f8d..dcd65d80e80 100644
>--- a/Source/WebCore/svg/SVGPatternElement.h
>+++ b/Source/WebCore/svg/SVGPatternElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
>+ * Copyright (C) 2018 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
>@@ -47,44 +48,50 @@ public:
> 
>     AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const final;
> 
>-    // SVGTests
>-    Ref<SVGStringList> requiredFeatures();
>-    Ref<SVGStringList> requiredExtensions();
>-    Ref<SVGStringList> systemLanguage();
>+    const SVGLengthValue& x() const { return m_x.currentValue(); }
>+    const SVGLengthValue& y() const { return m_y.currentValue(); }
>+    const SVGLengthValue& width() const { return m_width.currentValue(); }
>+    const SVGLengthValue& height() const { return m_height.currentValue(); }
>+    SVGUnitTypes::SVGUnitType patternUnits() const { return m_patternUnits.currentValue(); }
>+    SVGUnitTypes::SVGUnitType patternContentUnits() const { return m_patternContentUnits.currentValue(); }
>+    const SVGTransformListValues& patternTransform() const { return m_patternTransform.currentValue(); }
>+
>+    RefPtr<SVGAnimatedLength> xAnimated() { return m_x.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> yAnimated() { return m_y.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> widthAnimated() { return m_width.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> heightAnimated() { return m_height.animatedProperty(); }
>+    RefPtr<SVGAnimatedEnumeration> patternUnitsAnimated() { return m_patternUnits.animatedProperty(); }
>+    RefPtr<SVGAnimatedEnumeration> patternContentUnitsAnimated() { return m_patternContentUnits.animatedProperty(); }
>+    RefPtr<SVGAnimatedTransformList> patternTransformAnimated() { return m_patternTransform.animatedProperty(); }
> 
> private:
>     SVGPatternElement(const QualifiedName&, Document&);
>-    
>-    bool isValid() const final { return SVGTests::isValid(); }
>-    bool needsPendingResourceHandling() const final { return false; }
> 
>-    static bool isSupportedAttribute(const QualifiedName&);
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGPatternElement, SVGElement, SVGURIReference, SVGTests, SVGExternalResourcesRequired, SVGFitToViewBox>;
>+    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
>+    static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
>+    static bool isAnimatedLengthAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isAnimatedLengthAttribute(attributeName); }
>+    static void registerAttributes();
>+
>+    const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
>     void parseAttribute(const QualifiedName&, const AtomicString&) final;
>     void svgAttributeChanged(const QualifiedName&) final;
>     void childrenChanged(const ChildChange&) final;
> 
>     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
> 
>+    bool isValid() const final { return SVGTests::isValid(); }
>+    bool needsPendingResourceHandling() const final { return false; }
>     bool selfHasRelativeLengths() const final { return true; }
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGPatternElement)
>-        DECLARE_ANIMATED_LENGTH(X, x)
>-        DECLARE_ANIMATED_LENGTH(Y, y)
>-        DECLARE_ANIMATED_LENGTH(Width, width)
>-        DECLARE_ANIMATED_LENGTH(Height, height)
>-        DECLARE_ANIMATED_ENUMERATION(PatternUnits, patternUnits, SVGUnitTypes::SVGUnitType)
>-        DECLARE_ANIMATED_ENUMERATION(PatternContentUnits, patternContentUnits, SVGUnitTypes::SVGUnitType)
>-        DECLARE_ANIMATED_TRANSFORM_LIST(PatternTransform, patternTransform)
>-        DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-        DECLARE_ANIMATED_RECT(ViewBox, viewBox)
>-        DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio) 
>-    END_DECLARE_ANIMATED_PROPERTIES
>-
>-    // SVGTests
>-    void synchronizeRequiredFeatures() final { SVGTests::synchronizeRequiredFeatures(*this); }
>-    void synchronizeRequiredExtensions() final { SVGTests::synchronizeRequiredExtensions(*this); }
>-    void synchronizeSystemLanguage() final { SVGTests::synchronizeSystemLanguage(*this); }
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedLengthAttribute m_x { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_y { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedLengthAttribute m_width { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_height { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedEnumerationAttribute<SVGUnitTypes::SVGUnitType> m_patternUnits { m_attributeOwnerProxy, SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX };
>+    SVGAnimatedEnumerationAttribute<SVGUnitTypes::SVGUnitType> m_patternContentUnits { m_attributeOwnerProxy, SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE };
>+    SVGAnimatedTransformListAttribute m_patternTransform { m_attributeOwnerProxy };
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/svg/SVGStringListValues.h b/Source/WebCore/svg/SVGStringListValues.h
>index 6eca0417fa7..ff9a2742219 100644
>--- a/Source/WebCore/svg/SVGStringListValues.h
>+++ b/Source/WebCore/svg/SVGStringListValues.h
>@@ -22,8 +22,8 @@
> #pragma once
> 
> #include "QualifiedName.h"
>-#include "SVGPropertyTraits.h"
> #include "SVGAttributeAccessor.h"
>+#include "SVGPropertyTraits.h"
> 
> #include <wtf/Vector.h>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186751: 342916 | 342917 | 342985 | 343001 | 343114 | 343123 | 343124 | 343127 | 343129 | 343162 | 343167 | 343169 | 343171 | 343174 | 343213 | 343217 | 343327 | 343335 | 343338 | 343339 | 343343 | 343415 | 343979 | 343989 | 344002 | 344513 | 344516 | 344523 | 344534 | 344536 | 344988 | 344990 | 346097 | 346103 | 346124 | 346129 | 346177 | 346179 | 346180 | 346182 | 346185 | 346188 | 346190 | 346192 | 346193 | 346197 | 346199 | 346201 | 346202 | 346203 | 346204 | 346205 | 346206 | 346207 | 346211 | 346212 | 346217 | 346224 | 346230 | 346233 | 346241 | 346244 | 346245 | 346315 | 346316 | 346317 | 346318 | 346319 | 346320 | 346322 | 346323 | 346324 | 346325 | 346326 | 346327 | 346328 | 346329 | 346330 | 346331 | 346332 | 346333 | 346334 | 346335 | 346336 | 346337 | 346338 | 346339 | 346340 | 346341 | 346342 | 346343 | 346344 | 346345 | 346346 | 346347 | 346348 | 346349 | 346350 | 346518 | 346519 | 346520 | 346521 | 346522 | 346524 | 346525 | 346526 | 346527 | 346528 | 346529 | 346530 | 346531 | 346532 | 346533 | 346534 | 346535 | 346536 | 346537 | 346538 | 346539 | 346540 | 346541 | 346545 | 346546 | 346549 | 346551 | 346552 | 346601 | 346602 | 346611 | 346636 | 346642