Changeset 65917 in webkit

Timestamp:

Aug 24, 2010 11:33:27 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

Deploy adoptPtr to some more places in WebCore/html. The big chunk
that I haven't done yet is createRenderer, but that's going to be a big
patch unto itself.

• html/HTMLFormCollection.cpp: (WebCore::HTMLFormCollection::formCollectionInfo):
• html/HTMLFormElement.cpp: (WebCore::HTMLFormElement::addElementAlias):
• html/HTMLInputElement.cpp: (WebCore::createTypeMap): (WebCore::HTMLInputElement::setInputType): (WebCore::HTMLInputElement::parseMappedAttribute): (WebCore::HTMLInputElement::attach): (WebCore::HTMLInputElement::preDispatchEventHandler):
• html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::parseMappedAttribute): (WebCore::HTMLObjectElement::attach):
• html/HTMLToken.h: (WebCore::HTMLToken::beginDOCTYPE):
• html/HTMLVideoElement.cpp: (WebCore::HTMLVideoElement::attach): (WebCore::HTMLVideoElement::parseMappedAttribute):
• html/ValidityState.h: (WebCore::ValidityState::create):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormCollection.cpp (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (6 diffs)
• html/HTMLObjectElement.cpp (modified) (2 diffs)
• html/HTMLToken.h (modified) (1 diff)
• html/HTMLVideoElement.cpp (modified) (2 diffs)
• html/ValidityState.h (modified) (1 diff)

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
+
+        Deploy adoptPtr to some more places in WebCore/html.  The big chunk
+        that I haven't done yet is createRenderer, but that's going to be a big
+        patch unto itself.
+
+        * html/HTMLFormCollection.cpp:
+        (WebCore::HTMLFormCollection::formCollectionInfo):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::addElementAlias):
+        * html/HTMLInputElement.cpp:
+        (WebCore::createTypeMap):
+        (WebCore::HTMLInputElement::setInputType):
+        (WebCore::HTMLInputElement::parseMappedAttribute):
+        (WebCore::HTMLInputElement::attach):
+        (WebCore::HTMLInputElement::preDispatchEventHandler):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::parseMappedAttribute):
+        (WebCore::HTMLObjectElement::attach):
+        * html/HTMLToken.h:
+        (WebCore::HTMLToken::beginDOCTYPE):
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::attach):
+        (WebCore::HTMLVideoElement::parseMappedAttribute):
+        * html/ValidityState.h:
+        (WebCore::ValidityState::create):
+
 2010-08-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLFormCollection.cpp

@@ -40 +40 @@
 {
     if (!form->m_collectionCache)
-        form->m_collectionCache.set(new CollectionCache);
+        form->m_collectionCache = adoptPtr(new CollectionCache);
     return form->m_collectionCache.get();
 }

trunk/WebCore/html/HTMLFormElement.cpp

@@ -530 +530 @@
         return;
     if (!m_elementAliases)
-        m_elementAliases.set(new AliasMap);
+        m_elementAliases = adoptPtr(new AliasMap);
     m_elementAliases->set(alias.impl(), element);
 }

trunk/WebCore/html/HTMLInputElement.cpp

@@ -744 +744 @@
 
 typedef HashMap<String, HTMLInputElement::InputType, CaseFoldingHash> InputTypeMap;
-static const InputTypeMap* createTypeMap()
-{
-    InputTypeMap* map = new InputTypeMap;
+static PassOwnPtr<InputTypeMap> createTypeMap()
+{
+    OwnPtr<InputTypeMap> map = adoptPtr(new InputTypeMap);
     map->add("button", HTMLInputElement::BUTTON);
     map->add("checkbox", HTMLInputElement::CHECKBOX);
@@ -771 +771 @@
     map->add("week", HTMLInputElement::WEEK);
     // No need to register "text" because it is the default type.
-    return map;
+    return map.release();
 }
 
 void HTMLInputElement::setInputType(const String& t)
 {
-    static const InputTypeMap* typeMap = createTypeMap();
+    static const InputTypeMap* typeMap = createTypeMap().leakPtr();
     InputType newType = t.isNull() ? TEXT : typeMap->get(t);
 
@@ -1083 +1083 @@
         if (renderer() && inputType() == IMAGE) {
             if (!m_imageLoader)
-                m_imageLoader.set(new HTMLImageLoader(this));
+                m_imageLoader = adoptPtr(new HTMLImageLoader(this));
             m_imageLoader->updateFromElementIgnoringPreviousError();
         }
@@ -1206 +1206 @@
     if (inputType() == IMAGE) {
         if (!m_imageLoader)
-            m_imageLoader.set(new HTMLImageLoader(this));
+            m_imageLoader = adoptPtr(new HTMLImageLoader(this));
         m_imageLoader->updateFromElement();
         if (renderer() && m_imageLoader->haveFiredBeforeLoadEvent()) {
@@ -2049 +2049 @@
             && evt->type() == eventNames().clickEvent && static_cast<MouseEvent*>(evt)->button() == LeftButton) {
         
-        EventHandlingState* state = new EventHandlingState(indeterminate(), checked());
+        OwnPtr<EventHandlingState> state = adoptPtr(new EventHandlingState(indeterminate(), checked()));
 
         if (inputType() == CHECKBOX) {
@@ -2071 +2071 @@
             setChecked(true, true);
         }
-        result = state;
+        result = state.leakPtr(); // FIXME: Check whether this actually ends up leaking.
     }
     return result;

trunk/WebCore/html/HTMLObjectElement.cpp

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

trunk/WebCore/html/HTMLToken.h

@@ -129 +129 @@
         ASSERT(m_type == Uninitialized);
         m_type = DOCTYPE;
-        m_doctypeData.set(new DoctypeData());
+        m_doctypeData = adoptPtr(new DoctypeData());
     }
 

trunk/WebCore/html/HTMLVideoElement.cpp

@@ -77 +77 @@
     if (shouldDisplayPosterImage()) {
         if (!m_imageLoader)
-            m_imageLoader.set(new HTMLImageLoader(this));
+            m_imageLoader = adoptPtr(new HTMLImageLoader(this));
         m_imageLoader->updateFromElement();
         if (renderer()) {
@@ -106 +106 @@
         if (shouldDisplayPosterImage()) {
             if (!m_imageLoader)
-                m_imageLoader.set(new HTMLImageLoader(this));
+                m_imageLoader = adoptPtr(new HTMLImageLoader(this));
             m_imageLoader->updateFromElementIgnoringPreviousError();
         } else {

trunk/WebCore/html/ValidityState.h

@@ -34 +34 @@
     static PassOwnPtr<ValidityState> create(HTMLFormControlElement* control)
     {
-        return new ValidityState(control);
+        return adoptPtr(new ValidityState(control));
     }