Title: [145328] trunk/Source/WebKit2
- Revision
- 145328
- Author
- [email protected]
- Date
- 2013-03-10 10:41:13 -0700 (Sun, 10 Mar 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (145327 => 145328)
--- trunk/Source/WebKit2/ChangeLog 2013-03-10 16:46:16 UTC (rev 145327)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-10 17:41:13 UTC (rev 145328)
@@ -1,3 +1,19 @@
+2013-03-10 Andreas Kling <[email protected]>
+
+ 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 <[email protected]>
[GTK][WK2] Fix compilation warning missing-field-initializers in webkit-2.0 stable branch
Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (145327 => 145328)
--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2013-03-10 16:46:16 UTC (rev 145327)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2013-03-10 17:41:13 UTC (rev 145328)
@@ -139,9 +139,7 @@
invalidateCallbackMap(m_arrayCallbacks);
#if ENABLE(PLUGIN_PROCESS)
- deleteAllValues(m_pendingGetSitesWithData);
m_pendingGetSitesWithData.clear();
- deleteAllValues(m_pendingClearSiteData);
m_pendingClearSiteData.clear();
#endif
}
@@ -162,7 +160,7 @@
ASSERT(!m_pendingGetSitesWithData.contains(callbackID));
GetSitesWithDataState* state = new GetSitesWithDataState(this, callbackID);
- m_pendingGetSitesWithData.set(callbackID, state);
+ m_pendingGetSitesWithData.set(callbackID, adoptPtr(state));
state->getSitesWithDataForNextPlugin();
#else
Vector<PluginModuleInfo> plugins = m_webContext->pluginInfoStore().plugins();
@@ -222,7 +220,7 @@
ASSERT(!m_pendingClearSiteData.contains(callbackID));
ClearSiteDataState* state = new ClearSiteDataState(this, sitesVector, flags, maxAgeInSeconds, callbackID);
- m_pendingClearSiteData.set(callbackID, state);
+ m_pendingClearSiteData.set(callbackID, adoptPtr(state));
state->clearSiteDataForNextPlugin();
#else
Vector<PluginModuleInfo> plugins = m_webContext->pluginInfoStore().plugins();
@@ -267,7 +265,7 @@
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);
didGetSitesWithData(sites, callbackID);
@@ -283,7 +281,7 @@
void WebPluginSiteDataManager::didClearSiteDataForAllPlugins(uint64_t callbackID)
{
- OwnPtr<ClearSiteDataState> state = adoptPtr(m_pendingClearSiteData.take(callbackID));
+ OwnPtr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
ASSERT(state);
didClearSiteData(callbackID);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h (145327 => 145328)
--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2013-03-10 16:46:16 UTC (rev 145327)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2013-03-10 17:41:13 UTC (rev 145328)
@@ -78,10 +78,10 @@
void didClearSiteDataForAllPlugins(uint64_t callbackID);
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
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
