Changeset 65916 in webkit

Timestamp:

Aug 24, 2010 11:31:25 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-08-24 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Partial deployment of adoptPtr to WebCore/html
​https://bugs.webkit.org/show_bug.cgi?id=44507

There's a lot of places that need adoptPtr in WebCore/html. This patch
does some of them. More will follow.

• html/FileThreadTask.h: (WebCore::FileThreadTask0::create): (WebCore::FileThreadTask1::create): (WebCore::FileThreadTask2::create): (WebCore::FileThreadTask3::create):
• html/HTMLAreaElement.cpp: (WebCore::HTMLAreaElement::mapMouseEvent):
• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::getContext):
• html/HTMLElementStack.cpp: (WebCore::HTMLElementStack::insertAbove): (WebCore::HTMLElementStack::pushCommon):
• html/HTMLEmbedElement.cpp: (WebCore::HTMLEmbedElement::parseMappedAttribute): (WebCore::HTMLEmbedElement::attach):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/FileThreadTask.h (modified) (4 diffs)
• html/HTMLAreaElement.cpp (modified) (1 diff)
• html/HTMLCanvasElement.cpp (modified) (1 diff)
• html/HTMLElementStack.cpp (modified) (2 diffs)
• html/HTMLEmbedElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Partial deployment of adoptPtr to WebCore/html
+        https://bugs.webkit.org/show_bug.cgi?id=44507
+
+        There's a lot of places that need adoptPtr in WebCore/html.  This patch
+        does some of them.  More will follow.
+
+        * html/FileThreadTask.h:
+        (WebCore::FileThreadTask0::create):
+        (WebCore::FileThreadTask1::create):
+        (WebCore::FileThreadTask2::create):
+        (WebCore::FileThreadTask3::create):
+        * html/HTMLAreaElement.cpp:
+        (WebCore::HTMLAreaElement::mapMouseEvent):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+        * html/HTMLElementStack.cpp:
+        (WebCore::HTMLElementStack::insertAbove):
+        (WebCore::HTMLElementStack::pushCommon):
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::parseMappedAttribute):
+        (WebCore::HTMLEmbedElement::attach):
+
 2010-08-24  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/html/FileThreadTask.h

@@ -48 +48 @@
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method)
     {
-        return new FileThreadTaskImpl(instance, method);
+        return adoptPtr(new FileThreadTaskImpl(instance, method));
     }
 
@@ -76 +76 @@
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method, Param1 parameter1)
     {
-        return new FileThreadTaskImpl(instance, method, parameter1);
+        return adoptPtr(new FileThreadTaskImpl(instance, method, parameter1));
     }
 
@@ -107 +107 @@
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method, Param1 parameter1, Param2 parameter2)
     {
-        return new FileThreadTaskImpl(instance, method, parameter1, parameter2);
+        return adoptPtr(new FileThreadTaskImpl(instance, method, parameter1, parameter2));
     }
 
@@ -141 +141 @@
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
     {
-        return new FileThreadTaskImpl(instance, method, parameter1, parameter2, parameter3);
+        return adoptPtr(new FileThreadTaskImpl(instance, method, parameter1, parameter2, parameter3));
     }
 

trunk/WebCore/html/HTMLAreaElement.cpp

@@ -73 +73 @@
 {
     if (m_lastSize != size) {
-        m_region.set(new Path(getRegion(size)));
+        m_region = adoptPtr(new Path(getRegion(size)));
         m_lastSize = size;
     }

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -169 +169 @@
                 usesDashbardCompatibilityMode = settings->usesDashboardBackwardCompatibilityMode();
 #endif
-            m_context = new CanvasRenderingContext2D(this, document()->inCompatMode(), usesDashbardCompatibilityMode);
+            m_context = adoptPtr(new CanvasRenderingContext2D(this, document()->inCompatMode(), usesDashbardCompatibilityMode));
 #if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
             if (m_context) {

trunk/WebCore/html/HTMLElementStack.cpp

@@ -300 +300 @@
             continue;
 
-        recordAbove->setNext(new ElementRecord(element, recordAbove->releaseNext()));
+        recordAbove->setNext(adoptPtr(new ElementRecord(element, recordAbove->releaseNext())));
         recordAbove->next()->element()->beginParsingChildren();
         return;
@@ -493 +493 @@
 {
     ASSERT(m_htmlElement);
-    m_top.set(new ElementRecord(element, m_top.release()));
+    m_top = adoptPtr(new ElementRecord(element, m_top.release()));
     top()->beginParsingChildren();
 }

trunk/WebCore/html/HTMLEmbedElement.cpp

@@ -101 +101 @@
         if (renderer() && isImageType()) {
             if (!m_imageLoader)
-                m_imageLoader.set(new HTMLImageLoader(this));
+                m_imageLoader = adoptPtr(new HTMLImageLoader(this));
             m_imageLoader->updateFromElementIgnoringPreviousError();
         }
@@ -168 +168 @@
     if (isImage && renderer()) {
         if (!m_imageLoader)
-            m_imageLoader.set(new HTMLImageLoader(this));
+            m_imageLoader = adoptPtr(new HTMLImageLoader(this));
         m_imageLoader->updateFromElement();