Attachment 346211 Details for Bug 186751 – Remove the reference to SVGPropertyInfo.h from SVGAnimatedProperty.h

[patch] Remove the reference to SVGPropertyInfo.h from SVGAnimatedProperty.h

186751-23.patch (text/plain), 17.88 KB, created by Said Abou-Hallawa on 2018-07-31 15:30:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-07-31 15:30:04 PDT

Size: 17.88 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d80cd5a11c6..e90e0e8b241 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,46 @@
>+2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [23] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove the reference to SVGPropertyInfo.h from SVGAnimatedProperty.h.
>+
>+        Change lookupOrCreateAnimatedProperty():
>+        -- Be explicit for SVGElement parameter. SVGAnimatedPropertyDescription 
>+           has to take to a pointer to SVGElement.
>+        -- Add arguments for identifier and animatedState
>+        -- Add a template argument for animatedType.
>+        -- Make it return a RefPtr<SVGAnimatedProperty>. No need to return TearOffType
>+           because the caller expects SVGAnimatedProperty.
>+
>+        Change lookupWrapper():
>+        -- Be explicit for SVGElement parameter.
>+        -- Make it return a RefPtr<SVGAnimatedProperty>.
>+        -- It is not a template function anymore.
>+
>+        Change animatedPropertyCache():
>+        -- Use NeverDestroyed<> instead of direction allocation using "new"
>+        -- Make it return a reference to Cache.
>+
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * svg/properties/SVGAnimatedProperty.cpp:
>+        (WebCore::SVGAnimatedProperty::SVGAnimatedProperty):
>+        (WebCore::SVGAnimatedProperty::~SVGAnimatedProperty):
>+        (WebCore::SVGAnimatedProperty::animatedPropertyCache): Deleted.
>+        * svg/properties/SVGAnimatedProperty.h:
>+        (WebCore::SVGAnimatedProperty::isAnimating const):
>+        (WebCore::SVGAnimatedProperty::isAnimatedListTearOff const):
>+        (WebCore::SVGAnimatedProperty::lookupOrCreateAnimatedProperty):
>+        (WebCore::SVGAnimatedProperty::lookupAnimatedProperty):
>+        (WebCore::SVGAnimatedProperty::animatedPropertyCache):
>+        (WebCore::SVGAnimatedProperty::lookupOrCreateWrapper): Deleted.
>+        (WebCore::SVGAnimatedProperty::lookupWrapper): Deleted.
>+        * svg/properties/SVGAnimatedPropertyType.h: Added.
>+        * svg/properties/SVGAttribute.h:
>+        (WebCore::SVGPropertyAttribute::SVGPropertyAttribute):
>+
> 2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [22] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 2c15dff67e6..acce7af16cc 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -264,7 +264,6 @@
> 		0885067F11DA045B00182B98 /* PaintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0885067D11DA045B00182B98 /* PaintInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		0885068011DA045B00182B98 /* PaintPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0885067E11DA045B00182B98 /* PaintPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		088A0E04126EF1DB00978F7A /* SVGAnimatedListPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFB126EF1DB00978F7A /* SVGAnimatedListPropertyTearOff.h */; };
>-		088A0E05126EF1DB00978F7A /* SVGAnimatedProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFC126EF1DB00978F7A /* SVGAnimatedProperty.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		088A0E06126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		088A0E07126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFE126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */; };
>@@ -1725,7 +1724,8 @@
> 		55FA7FF5210FB6B1005AEFE7 /* SVGAttributeAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FF4210FB688005AEFE7 /* SVGAttributeAccessor.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		55FA7FF7210FBE3E005AEFE7 /* SVGAttributeRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FF6210FBE3E005AEFE7 /* SVGAttributeRegistry.h */; };
> 		55FA7FFB2110ECD7005AEFE7 /* SVGZoomAndPanType.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FFA2110ECD7005AEFE7 /* SVGZoomAndPanType.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		55FA7FFF21110E6E005AEFE7 /* :SVGAnimatedPropertyType.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FFE21110E6E005AEFE7 /* :SVGAnimatedPropertyType.h */; };
>+		55FA7FFF21110E6E005AEFE7 /* SVGAnimatedPropertyType.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		55FA8001211113EE005AEFE7 /* SVGAnimatedProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFC126EF1DB00978F7A /* SVGAnimatedProperty.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5704405A1E53936200356601 /* JSAesCbcCfbParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 570440591E53936200356601 /* JSAesCbcCfbParams.h */; };
> 		5706A6961DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 5706A6951DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h */; };
> 		5706A6981DDE5E4600A03B14 /* JSRsaOaepParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 5706A6971DDE5E4600A03B14 /* JSRsaOaepParams.h */; };
>@@ -8406,7 +8406,7 @@
> 		55FA7FF9210FDB34005AEFE7 /* SVGAttributeOwnerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAttributeOwnerProxy.h; sourceTree = "<group>"; };
> 		55FA7FFA2110ECD7005AEFE7 /* SVGZoomAndPanType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGZoomAndPanType.h; sourceTree = "<group>"; };
> 		55FA7FFC2110F813005AEFE7 /* SVGAnimatedPathSegListPropertyTearOff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedPathSegListPropertyTearOff.cpp; sourceTree = "<group>"; };
>-		55FA7FFE21110E6E005AEFE7 /* :SVGAnimatedPropertyType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ":SVGAnimatedPropertyType.h"; sourceTree = "<group>"; };
>+		55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyType.h; sourceTree = "<group>"; };
> 		570440571E53851600356601 /* CryptoAlgorithmAES_CFBMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_CFBMac.cpp; sourceTree = "<group>"; };
> 		570440591E53936200356601 /* JSAesCbcCfbParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAesCbcCfbParams.h; sourceTree = "<group>"; };
> 		5704405B1E53937900356601 /* JSAesCbcCfbParams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAesCbcCfbParams.cpp; sourceTree = "<group>"; };
>@@ -15465,6 +15465,7 @@
> 				088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */,
> 				088A0DFE126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h */,
> 				088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */,
>+				55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */,
> 				08525E621278C00100A84778 /* SVGAnimatedStaticPropertyTearOff.h */,
> 				085A15921289A8DD002710E3 /* SVGAnimatedTransformListPropertyTearOff.h */,
> 				55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */,
>@@ -15483,7 +15484,6 @@
> 				088A0E03126EF1DB00978F7A /* SVGPropertyTraits.h */,
> 				0880F70D1282B46D00948505 /* SVGStaticListPropertyTearOff.h */,
> 				0813A4E91284132600992511 /* SVGStaticPropertyTearOff.h */,
>-				55FA7FFE21110E6E005AEFE7 /* :SVGAnimatedPropertyType.h */,
> 			);
> 			path = properties;
> 			sourceTree = "<group>";
>@@ -28341,6 +28341,7 @@
> 				CD19FEA81F573972000C42FB /* ImageDecoder.h in Headers */,
> 				CD19FEAE1F574B6D000C42FB /* ImageDecoderAVFObjC.h in Headers */,
> 				555B87ED1CAAF0AB00349425 /* ImageDecoderCG.h in Headers */,
>+				55FA8001211113EE005AEFE7 /* SVGAnimatedProperty.h in Headers */,
> 				97205AB61239291000B17380 /* ImageDocument.h in Headers */,
> 				5576A5651D88A70800CCC04C /* ImageFrame.h in Headers */,
> 				F55B3DC21251F12D003EF269 /* ImageInputType.h in Headers */,
>@@ -30392,7 +30393,7 @@
> 				A8EA800A0A19516E00A8EF5F /* StyleSheetList.h in Headers */,
> 				BC5EB5E50E81BF6D00B25965 /* StyleSurroundData.h in Headers */,
> 				BC5EB8100E81F2CE00B25965 /* StyleTransformData.h in Headers */,
>-				55FA7FFF21110E6E005AEFE7 /* :SVGAnimatedPropertyType.h in Headers */,
>+				55FA7FFF21110E6E005AEFE7 /* SVGAnimatedPropertyType.h in Headers */,
> 				E4DEAA1817A93DC3000E0430 /* StyleTreeResolver.h in Headers */,
> 				E42E76DC1C7AF77600E3614D /* StyleUpdate.h in Headers */,
> 				E48137B91DB3B526005C59BF /* StyleValidity.h in Headers */,
>@@ -30433,7 +30434,6 @@
> 				089A8E07128D8B3D00E7A534 /* SVGAnimatedPathSegListPropertyTearOff.h in Headers */,
> 				43B9336913B261B1004584BF /* SVGAnimatedPointList.h in Headers */,
> 				08FE0BC5127E2AC1000C4FB5 /* SVGAnimatedPreserveAspectRatio.h in Headers */,
>-				088A0E05126EF1DB00978F7A /* SVGAnimatedProperty.h in Headers */,
> 				088A0E06126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h in Headers */,
> 				088A0E07126EF1DB00978F7A /* SVGAnimatedPropertyMacros.h in Headers */,
> 				088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */,
>diff --git a/Source/WebCore/svg/properties/SVGAnimatedProperty.cpp b/Source/WebCore/svg/properties/SVGAnimatedProperty.cpp
>index f24a8d871e7..e4eec385bfe 100644
>--- a/Source/WebCore/svg/properties/SVGAnimatedProperty.cpp
>+++ b/Source/WebCore/svg/properties/SVGAnimatedProperty.cpp
>@@ -1,7 +1,7 @@
> /*
>  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
>  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
>- * Copyright (C) 2016 Apple Inc. All rights reserved.
>+ * Copyright (C) 2016-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
>@@ -30,22 +30,23 @@ SVGAnimatedProperty::SVGAnimatedProperty(SVGElement* contextElement, const Quali
>     : m_contextElement(contextElement)
>     , m_attributeName(attributeName)
>     , m_animatedPropertyType(animatedPropertyType)
>-    , m_isReadOnly(false)
> {
> }
> 
> SVGAnimatedProperty::~SVGAnimatedProperty()
> {
>+    // Assure that animationEnded() was called, if animationStarted() was called before.
>+    ASSERT(!isAnimating());
>+
>     // Remove wrapper from cache.
>-    for (auto& cache : *animatedPropertyCache()) {
>+    for (auto& cache : animatedPropertyCache()) {
>         if (cache.value == this) {
>-            animatedPropertyCache()->remove(cache.key);
>-            break;
>+            animatedPropertyCache().remove(cache.key);
>+            return;
>         }
>     }
> 
>-    // Assure that animationEnded() was called, if animationStarted() was called before.
>-    ASSERT(!isAnimating());
>+    RELEASE_ASSERT_NOT_REACHED();
> }
> 
> void SVGAnimatedProperty::commitChange()
>@@ -58,10 +59,4 @@ void SVGAnimatedProperty::commitChange()
>     m_contextElement->synchronizeAnimatedSVGAttribute(m_attributeName);
> }
> 
>-SVGAnimatedProperty::Cache* SVGAnimatedProperty::animatedPropertyCache()
>-{
>-    static Cache* s_cache = new Cache;
>-    return s_cache;
>-}
>-
> } // namespace WebCore
>diff --git a/Source/WebCore/svg/properties/SVGAnimatedProperty.h b/Source/WebCore/svg/properties/SVGAnimatedProperty.h
>index 6629413830f..f671e69a0b8 100644
>--- a/Source/WebCore/svg/properties/SVGAnimatedProperty.h
>+++ b/Source/WebCore/svg/properties/SVGAnimatedProperty.h
>@@ -1,7 +1,7 @@
> /*
>  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
>  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
>- * Copyright (C) 2016 Apple Inc. All rights reserved.
>+ * Copyright (C) 2016-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
>@@ -21,8 +21,9 @@
> 
> #pragma once
> 
>+#include "QualifiedName.h"
> #include "SVGAnimatedPropertyDescription.h"
>-#include "SVGPropertyInfo.h"
>+#include "SVGAnimatedPropertyType.h"
> #include <wtf/RefCounted.h>
> 
> namespace WebCore {
>@@ -32,6 +33,10 @@ class SVGProperty;
> 
> class SVGAnimatedProperty : public RefCounted<SVGAnimatedProperty> {
> public:
>+    virtual ~SVGAnimatedProperty();
>+    virtual bool isAnimating() const { return false; }
>+    virtual bool isAnimatedListTearOff() const { return false; }
>+
>     SVGElement* contextElement() const { return m_contextElement.get(); }
>     const QualifiedName& attributeName() const { return m_attributeName; }
>     AnimatedPropertyType animatedPropertyType() const { return m_animatedPropertyType; }
>@@ -40,60 +45,49 @@ public:
> 
>     void commitChange();
> 
>-    virtual bool isAnimating() const { return false; }
>-    virtual bool isAnimatedListTearOff() const { return false; }
>-
>-    // Caching facilities.
>-    typedef HashMap<SVGAnimatedPropertyDescription, SVGAnimatedProperty*, SVGAnimatedPropertyDescriptionHash, SVGAnimatedPropertyDescriptionHashTraits> Cache;
>-
>-    virtual ~SVGAnimatedProperty();
>-
>-    template<typename OwnerType, typename TearOffType, typename PropertyType>
>-    static Ref<TearOffType> lookupOrCreateWrapper(OwnerType* element, const SVGPropertyInfo* info, PropertyType& property)
>+    template<typename TearOffType, typename PropertyType, AnimatedPropertyType animatedType>
>+    static RefPtr<SVGAnimatedProperty> lookupOrCreateAnimatedProperty(SVGElement& element, const QualifiedName& attributeName, const AtomicString& identifier, PropertyType& property, AnimatedPropertyState animatedState)
>     {
>-        ASSERT(info);
>-        SVGAnimatedPropertyDescription key(element, info->propertyIdentifier);
>+        SVGAnimatedPropertyDescription key(&element, identifier);
> 
>-        auto result = animatedPropertyCache()->add(key, nullptr);
>+        auto result = animatedPropertyCache().add(key, nullptr);
>         if (!result.isNewEntry)
>-            return static_cast<TearOffType&>(*result.iterator->value);
>+            return result.iterator->value;
> 
>-        Ref<SVGAnimatedProperty> wrapper = TearOffType::create(element, info->attributeName, info->animatedPropertyType, property);
>-        if (info->animatedPropertyState == PropertyIsReadOnly)
>+        auto wrapper = TearOffType::create(&element, attributeName, animatedType, property);
>+        if (animatedState == PropertyIsReadOnly)
>             wrapper->setIsReadOnly();
> 
>-        // Cache the raw pointer but return a Ref<>. This will break the cyclic reference
>+        // Cache the raw pointer but return a RefPtr<>. This will break the cyclic reference
>         // between SVGAnimatedProperty and SVGElement once the property pointer is not needed.
>         result.iterator->value = wrapper.ptr();
>-        return static_reference_cast<TearOffType>(wrapper);
>-    }
>-
>-    template<typename OwnerType, typename TearOffType>
>-    static RefPtr<TearOffType> lookupWrapper(OwnerType* element, const SVGPropertyInfo* info)
>-    {
>-        ASSERT(info);
>-        SVGAnimatedPropertyDescription key(element, info->propertyIdentifier);
>-        return static_cast<TearOffType*>(animatedPropertyCache()->get(key));
>+        return static_reference_cast<SVGAnimatedProperty>(wrapper);
>     }
> 
>-    template<typename OwnerType, typename TearOffType>
>-    static RefPtr<TearOffType> lookupWrapper(const OwnerType* element, const SVGPropertyInfo* info)
>+    static RefPtr<SVGAnimatedProperty> lookupAnimatedProperty(const SVGElement& element, const AtomicString& identifier)
>     {
>-        return lookupWrapper<OwnerType, TearOffType>(const_cast<OwnerType*>(element), info);
>+        SVGAnimatedPropertyDescription key(const_cast<SVGElement*>(&element), identifier);
>+        return animatedPropertyCache().get(key);
>     }
> 
> protected:
>     SVGAnimatedProperty(SVGElement*, const QualifiedName&, AnimatedPropertyType);
> 
> private:
>-    static Cache* animatedPropertyCache();
>+    // Caching facilities.
>+    using Cache = HashMap<SVGAnimatedPropertyDescription, SVGAnimatedProperty*, SVGAnimatedPropertyDescriptionHash, SVGAnimatedPropertyDescriptionHashTraits>;
>+    static Cache& animatedPropertyCache()
>+    {
>+        static NeverDestroyed<Cache> s_cache;
>+        return s_cache;
>+    }
> 
>     RefPtr<SVGElement> m_contextElement;
>     const QualifiedName& m_attributeName;
>     AnimatedPropertyType m_animatedPropertyType;
> 
> protected:
>-    bool m_isReadOnly;
>+    bool m_isReadOnly { false };
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/svg/properties/SVGAttribute.h b/Source/WebCore/svg/properties/SVGAttribute.h
>index b0670c8d12f..60fc0eb953b 100644
>--- a/Source/WebCore/svg/properties/SVGAttribute.h
>+++ b/Source/WebCore/svg/properties/SVGAttribute.h
>@@ -44,7 +44,7 @@ public:
>     }
> 
>     template<typename... Arguments>
>-    SVGPropertyAttribute(Arguments&&... arguments)
>+    SVGPropertyAttribute(const SVGAttributeOwnerProxy& attributeOwnerProxy, Arguments&&... arguments)
>         : m_property(std::forward<Arguments>(arguments)...)
>         , m_attributeOwnerProxy(attributeOwnerProxy)
>     {
>@@ -80,8 +80,9 @@ public:
>     using PropertyTearOffType = TearOffType;
>     using PropertyType = typename PropertyTearOffType::ContentType;
>     using Base = SVGPropertyAttribute<PropertyType>;
>-    using Base::m_shouldSynchronize;
>     using Base::m_property;
>+    using Base::m_shouldSynchronize;
>+    using Base::m_attributeOwnerProxy;
> 
>     SVGAnimatedAttribute(const SVGAttributeOwnerProxy& attributeOwnerProxy)
>         : Base(attributeOwnerProxy)
>@@ -119,6 +120,7 @@ public:
>     using PropertyTearOffType = TearOffType;
>     using PropertyType = typename PropertyTearOffType::ContentType;
>     using Base = SVGAnimatedAttribute<PropertyTearOffType>;
>+    using Base::m_attributeOwnerProxy;
> 
>     SVGAnimatedAttributeList(const SVGAttributeOwnerProxy& attributeOwnerProxy)
>         : Base(attributeOwnerProxy)

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