Changeset 145327 in webkit

Timestamp:

Mar 10, 2013 9:46:16 AM (11 years ago)

Author:

akling@apple.com

Message:

GlyphMetricsMap should use OwnPtr.
<​http://webkit.org/b/111937>

Reviewed by Anders Carlsson.

Use OwnPtr instead of raw pointer + deleteAllValues().

• platform/graphics/GlyphMetricsMap.h:

(GlyphMetricsMap):
(WebCore::::locatePageSlowCase):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GlyphMetricsMap.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-10  Andreas Kling  <akling@apple.com>
+
+        GlyphMetricsMap should use OwnPtr.
+        <http://webkit.org/b/111937>
+
+        Reviewed by Anders Carlsson.
+
+        Use OwnPtr instead of raw pointer + deleteAllValues().
+
+        * platform/graphics/GlyphMetricsMap.h:
+        (GlyphMetricsMap):
+        (WebCore::::locatePageSlowCase):
+
 2013-03-10  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h

@@ -44 +44 @@
 public:
     GlyphMetricsMap() : m_filledPrimaryPage(false) { }
-    ~GlyphMetricsMap()
-    { 
-        if (m_pages)
-            deleteAllValues(*m_pages);
-    }
-
     T metricsForGlyph(Glyph glyph)
     {
@@ -89 +83 @@
     bool m_filledPrimaryPage;
     GlyphMetricsPage m_primaryPage; // We optimize for the page that contains glyph indices 0-255.
-    OwnPtr<HashMap<int, GlyphMetricsPage*> > m_pages;
+    OwnPtr<HashMap<int, OwnPtr<GlyphMetricsPage> > > m_pages;
 };
 
@@ -114 +108 @@
                 return page;
         } else
-            m_pages = adoptPtr(new HashMap<int, GlyphMetricsPage*>);
+            m_pages = adoptPtr(new HashMap<int, OwnPtr<GlyphMetricsPage> >);
         page = new GlyphMetricsPage;
-        m_pages->set(pageNumber, page);
+        m_pages->set(pageNumber, adoptPtr(page));
     }