Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / svg / SVGImageElement.h

diff --git a/src/third_party/WebKit/Source/core/svg/SVGImageElement.h b/src/third_party/WebKit/Source/core/svg/SVGImageElement.h
index 95aa39e..6bd6471 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGImageElement.h
+++ b/src/third_party/WebKit/Source/core/svg/SVGImageElement.h
@@ -21,7 +21,7 @@
 #ifndef SVGImageElement_h
 #define SVGImageElement_h
 
-#include "SVGNames.h"
+#include "core/SVGNames.h"
 #include "core/svg/SVGAnimatedBoolean.h"
 #include "core/svg/SVGAnimatedLength.h"
 #include "core/svg/SVGAnimatedPreserveAspectRatio.h"
@@ -29,12 +29,14 @@
 #include "core/svg/SVGImageLoader.h"
 #include "core/svg/SVGURIReference.h"
 
-namespace WebCore {
+namespace blink {
 
-class SVGImageElement FINAL : public SVGGraphicsElement,
+class SVGImageElement final : public SVGGraphicsElement,
                               public SVGURIReference {
+    DEFINE_WRAPPERTYPEINFO();
 public:
-    static PassRefPtr<SVGImageElement> create(Document&);
+    DECLARE_NODE_FACTORY(SVGImageElement);
+    virtual void trace(Visitor*) override;
 
     bool currentFrameHasSingleSecurityOrigin() const;
 
@@ -47,26 +49,26 @@ public:
 private:
     explicit SVGImageElement(Document&);
 
-    virtual bool isStructurallyExternal() const OVERRIDE { return !hrefString().isNull(); }
-    virtual bool supportsFocus() const OVERRIDE { return hasFocusEventListeners(); }
+    virtual bool isStructurallyExternal() const override { return !hrefString().isNull(); }
 
     bool isSupportedAttribute(const QualifiedName&);
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
-    virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) OVERRIDE;
-    virtual void svgAttributeChanged(const QualifiedName&) OVERRIDE;
+    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
+    virtual bool isPresentationAttribute(const QualifiedName&) const override;
+    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) override;
+    virtual void svgAttributeChanged(const QualifiedName&) override;
 
-    virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
-    virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
+    virtual void attach(const AttachContext& = AttachContext()) override;
+    virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
 
-    virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
+    virtual RenderObject* createRenderer(RenderStyle*) override;
 
-    virtual const AtomicString imageSourceURL() const OVERRIDE;
+    virtual const AtomicString imageSourceURL() const override;
 
-    virtual bool haveLoadedRequiredResources() OVERRIDE;
+    virtual bool haveLoadedRequiredResources() override;
 
-    virtual bool selfHasRelativeLengths() const OVERRIDE;
-    virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE;
+    virtual bool selfHasRelativeLengths() const override;
+    virtual void didMoveToNewDocument(Document& oldDocument) override;
+    SVGImageLoader& imageLoader() { return *m_imageLoader; }
 
     RefPtr<SVGAnimatedLength> m_x;
     RefPtr<SVGAnimatedLength> m_y;
@@ -74,10 +76,10 @@ private:
     RefPtr<SVGAnimatedLength> m_height;
     RefPtr<SVGAnimatedPreserveAspectRatio> m_preserveAspectRatio;
 
-    SVGImageLoader m_imageLoader;
+    OwnPtrWillBeMember<SVGImageLoader> m_imageLoader;
     bool m_needsLoaderURIUpdate : 1;
 };
 
-} // namespace WebCore
+} // namespace blink
 
-#endif
+#endif // SVGImageElement_h