Changeset 84844 in webkit

Timestamp:

Apr 25, 2011 4:51:13 PM (13 years ago)

Author:

adamk@chromium.org

Message:

2011-04-25 Adam Klein <​adamk@chromium.org>

Reviewed by James Robinson.

Fix OwnPtr strict errors in some SVG classes.
​https://bugs.webkit.org/show_bug.cgi?id=59395

• rendering/style/SVGRenderStyleDefs.cpp: (WebCore::StyleShadowSVGData::StyleShadowSVGData):
• svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::SVGSVGElement):
• svg/SVGStyledTransformableElement.cpp: (WebCore::SVGStyledTransformableElement::supplementalTransform):
• svg/SVGTextElement.cpp: (WebCore::SVGTextElement::supplementalTransform):
• svg/graphics/SVGImage.cpp: (WebCore::SVGImage::dataChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/SVGRenderStyleDefs.cpp (modified) (1 diff)
• svg/SVGDocumentExtensions.cpp (modified) (2 diffs)
• svg/SVGSVGElement.cpp (modified) (1 diff)
• svg/SVGStyledTransformableElement.cpp (modified) (1 diff)
• svg/SVGTextElement.cpp (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Adam Klein  <adamk@chromium.org>
+
+        Reviewed by James Robinson.
+
+        Fix OwnPtr strict errors in some SVG classes.
+        https://bugs.webkit.org/show_bug.cgi?id=59395
+
+        * rendering/style/SVGRenderStyleDefs.cpp:
+        (WebCore::StyleShadowSVGData::StyleShadowSVGData):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::SVGSVGElement):
+        * svg/SVGStyledTransformableElement.cpp:
+        (WebCore::SVGStyledTransformableElement::supplementalTransform):
+        * svg/SVGTextElement.cpp:
+        (WebCore::SVGTextElement::supplementalTransform):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::dataChanged):
+
 2011-04-25  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp

@@ -164 +164 @@
 StyleShadowSVGData::StyleShadowSVGData(const StyleShadowSVGData& other)
     : RefCounted<StyleShadowSVGData>()
-    , shadow(other.shadow ? new ShadowData(*other.shadow) : 0)
+    , shadow(other.shadow ? adoptPtr(new ShadowData(*other.shadow)) : PassOwnPtr<ShadowData>())
 {
 }

trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp

@@ -22 +22 @@
 #include "config.h"
 
+#define ADAMK
+#include "OwnPtr.h"
+#undef ADAMK
 #if ENABLE(SVG)
 #include "SVGDocumentExtensions.h"
@@ -241 +244 @@
     ASSERT(m_pendingResources.contains(id));
 
-    OwnPtr<SVGPendingElements> set(m_pendingResources.get(id));
+    OwnPtr<SVGPendingElements> set(adoptPtr(m_pendingResources.get(id)));
     m_pendingResources.remove(id);
     return set.release();

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -72 +72 @@
     , m_timeContainer(SMILTimeContainer::create(this))
     , m_scale(1)
-    , m_viewSpec(0)
     , m_containerSize(300, 150)
     , m_hasSetContainerSize(false)

trunk/Source/WebCore/svg/SVGStyledTransformableElement.cpp

@@ -66 +66 @@
 {
     if (!m_supplementalTransform)
-        m_supplementalTransform.set(new AffineTransform());
+        m_supplementalTransform = adoptPtr(new AffineTransform);
     return m_supplementalTransform.get();
 }

trunk/Source/WebCore/svg/SVGTextElement.cpp

@@ -98 +98 @@
 {
     if (!m_supplementalTransform)
-        m_supplementalTransform.set(new AffineTransform());
+        m_supplementalTransform = adoptPtr(new AffineTransform);
     return m_supplementalTransform.get();
 }

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -269 +269 @@
         // SVGImage objects, but we're safe now, because SVGImage can only be
         // loaded by a top-level document.
-        m_page.set(new Page(pageClients));
+        m_page = adoptPtr(new Page(pageClients));
         m_page->settings()->setMediaEnabled(false);
         m_page->settings()->setJavaScriptEnabled(false);