Changeset 65919 in webkit

Timestamp:

Aug 24, 2010 11:37:32 AM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Deploy adoptPtr in WebCore/editing
​https://bugs.webkit.org/show_bug.cgi?id=44501

• editing/Editor.cpp: (WebCore::Editor::Editor):
• editing/TextIterator.cpp: (WebCore::plainTextToMallocAllocatedBuffer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/TextIterator.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Deploy adoptPtr in WebCore/editing
+        https://bugs.webkit.org/show_bug.cgi?id=44501
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::Editor):
+        * editing/TextIterator.cpp:
+        (WebCore::plainTextToMallocAllocatedBuffer):
+
 2010-08-24  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/editing/Editor.cpp

@@ -998 +998 @@
 Editor::Editor(Frame* frame)
     : m_frame(frame)
-    , m_deleteButtonController(new DeleteButtonController(frame))
+    , m_deleteButtonController(adoptPtr(new DeleteButtonController(frame)))
     , m_ignoreCompositionSelectionChange(false)
     , m_shouldStartNewKillRingSequence(false)
     // This is off by default, since most editors want this behavior (this matches IE but not FF).
     , m_shouldStyleWithCSS(false)
-    , m_killRing(new KillRing)
+    , m_killRing(adoptPtr(new KillRing))
 { 
 }

trunk/WebCore/editing/TextIterator.cpp

@@ -2224 +2224 @@
     bufferLength = 0;
     typedef pair<UChar*, unsigned> TextSegment;
-    Vector<TextSegment>* textSegments = 0;
+    OwnPtr<Vector<TextSegment> > textSegments;
     Vector<UChar> textBuffer;
     textBuffer.reserveInitialCapacity(cMaxSegmentSize);
@@ -2234 +2234 @@
             memcpy(newSegmentBuffer, textBuffer.data(), textBuffer.size() * sizeof(UChar));
             if (!textSegments)
-                textSegments = new Vector<TextSegment>;
+                textSegments = adoptPtr(new Vector<TextSegment>);
             textSegments->append(make_pair(newSegmentBuffer, (unsigned)textBuffer.size()));
             textBuffer.clear();
@@ -2268 +2268 @@
         for (unsigned i = 0; i < size; ++i)
             free(textSegments->at(i).first);
-        delete textSegments;
+        textSegments.clear();
     }