Changeset 145328 in webkit
- Timestamp:
- Mar 10, 2013 10:41:13 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r145308 r145328 1 2013-03-10 Andreas Kling <akling@apple.com> 2 3 WebPluginSiteDataManager should use OwnPtr. 4 <http://webkit.org/b/111940> 5 6 Reviewed by Anders Carlsson. 7 8 * UIProcess/Plugins/WebPluginSiteDataManager.cpp: 9 (WebKit::WebPluginSiteDataManager::invalidate): 10 (WebKit::WebPluginSiteDataManager::getSitesWithData): 11 (WebKit::WebPluginSiteDataManager::clearSiteData): 12 (WebKit::WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins): 13 (WebKit::WebPluginSiteDataManager::didClearSiteDataForAllPlugins): 14 * UIProcess/Plugins/WebPluginSiteDataManager.h: 15 (WebPluginSiteDataManager): 16 1 17 2013-03-09 Manuel Rego Casasnovas <rego@igalia.com> 2 18 -
trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
r131844 r145328 140 140 141 141 #if ENABLE(PLUGIN_PROCESS) 142 deleteAllValues(m_pendingGetSitesWithData);143 142 m_pendingGetSitesWithData.clear(); 144 deleteAllValues(m_pendingClearSiteData);145 143 m_pendingClearSiteData.clear(); 146 144 #endif … … 163 161 164 162 GetSitesWithDataState* state = new GetSitesWithDataState(this, callbackID); 165 m_pendingGetSitesWithData.set(callbackID, state);163 m_pendingGetSitesWithData.set(callbackID, adoptPtr(state)); 166 164 state->getSitesWithDataForNextPlugin(); 167 165 #else … … 223 221 224 222 ClearSiteDataState* state = new ClearSiteDataState(this, sitesVector, flags, maxAgeInSeconds, callbackID); 225 m_pendingClearSiteData.set(callbackID, state);223 m_pendingClearSiteData.set(callbackID, adoptPtr(state)); 226 224 state->clearSiteDataForNextPlugin(); 227 225 #else … … 268 266 void WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID) 269 267 { 270 OwnPtr<GetSitesWithDataState> state = adoptPtr(m_pendingGetSitesWithData.take(callbackID));268 OwnPtr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID); 271 269 ASSERT(state); 272 270 … … 284 282 void WebPluginSiteDataManager::didClearSiteDataForAllPlugins(uint64_t callbackID) 285 283 { 286 OwnPtr<ClearSiteDataState> state = adoptPtr(m_pendingClearSiteData.take(callbackID));284 OwnPtr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID); 287 285 ASSERT(state); 288 286 -
trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
r131844 r145328 79 79 80 80 class GetSitesWithDataState; 81 HashMap<uint64_t, GetSitesWithDataState*> m_pendingGetSitesWithData;81 HashMap<uint64_t, OwnPtr<GetSitesWithDataState> > m_pendingGetSitesWithData; 82 82 83 83 class ClearSiteDataState; 84 HashMap<uint64_t, ClearSiteDataState*> m_pendingClearSiteData;84 HashMap<uint64_t, OwnPtr<ClearSiteDataState> > m_pendingClearSiteData; 85 85 #endif 86 86 };
Note: See TracChangeset
for help on using the changeset viewer.