Changeset 145328 in webkit

Timestamp:

Mar 10, 2013 10:41:13 AM (11 years ago)

Author:

akling@apple.com

Message:

WebPluginSiteDataManager should use OwnPtr.
<​http://webkit.org/b/111940>

Reviewed by Anders Carlsson.

• UIProcess/Plugins/WebPluginSiteDataManager.cpp:

(WebKit::WebPluginSiteDataManager::invalidate):
(WebKit::WebPluginSiteDataManager::getSitesWithData):
(WebKit::WebPluginSiteDataManager::clearSiteData):
(WebKit::WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins):
(WebKit::WebPluginSiteDataManager::didClearSiteDataForAllPlugins):

• UIProcess/Plugins/WebPluginSiteDataManager.h:

(WebPluginSiteDataManager):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/WebPluginSiteDataManager.cpp (modified) (5 diffs)
• UIProcess/Plugins/WebPluginSiteDataManager.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-10  Andreas Kling  <akling@apple.com>
+
+        WebPluginSiteDataManager should use OwnPtr.
+        <http://webkit.org/b/111940>
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+        (WebKit::WebPluginSiteDataManager::invalidate):
+        (WebKit::WebPluginSiteDataManager::getSitesWithData):
+        (WebKit::WebPluginSiteDataManager::clearSiteData):
+        (WebKit::WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins):
+        (WebKit::WebPluginSiteDataManager::didClearSiteDataForAllPlugins):
+        * UIProcess/Plugins/WebPluginSiteDataManager.h:
+        (WebPluginSiteDataManager):
+
 2013-03-09  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp

@@ -140 +140 @@
 
 #if ENABLE(PLUGIN_PROCESS)
-    deleteAllValues(m_pendingGetSitesWithData);
     m_pendingGetSitesWithData.clear();
-    deleteAllValues(m_pendingClearSiteData);
     m_pendingClearSiteData.clear();
 #endif
@@ -163 +161 @@
 
     GetSitesWithDataState* state = new GetSitesWithDataState(this, callbackID);
-    m_pendingGetSitesWithData.set(callbackID, state);
+    m_pendingGetSitesWithData.set(callbackID, adoptPtr(state));
     state->getSitesWithDataForNextPlugin();
 #else
@@ -223 +221 @@
 
     ClearSiteDataState* state = new ClearSiteDataState(this, sitesVector, flags, maxAgeInSeconds, callbackID);
-    m_pendingClearSiteData.set(callbackID, state);
+    m_pendingClearSiteData.set(callbackID, adoptPtr(state));
     state->clearSiteDataForNextPlugin();
 #else
@@ -268 +266 @@
 void WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID)
 {
-    OwnPtr<GetSitesWithDataState> state = adoptPtr(m_pendingGetSitesWithData.take(callbackID));
+    OwnPtr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID);
     ASSERT(state);
 
@@ -284 +282 @@
 void WebPluginSiteDataManager::didClearSiteDataForAllPlugins(uint64_t callbackID)
 {
-    OwnPtr<ClearSiteDataState> state = adoptPtr(m_pendingClearSiteData.take(callbackID));
+    OwnPtr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
     ASSERT(state);
 

trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h

@@ -79 +79 @@
 
     class GetSitesWithDataState;
-    HashMap<uint64_t, GetSitesWithDataState*> m_pendingGetSitesWithData;
+    HashMap<uint64_t, OwnPtr<GetSitesWithDataState> > m_pendingGetSitesWithData;
 
     class ClearSiteDataState;
-    HashMap<uint64_t, ClearSiteDataState*> m_pendingClearSiteData;
+    HashMap<uint64_t, OwnPtr<ClearSiteDataState> > m_pendingClearSiteData;
 #endif
 };