Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
index ff96ab96c..005591cc8 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
@@ -139,9 +139,7 @@ void WebPluginSiteDataManager::invalidate()
     invalidateCallbackMap(m_arrayCallbacks);
 
 #if ENABLE(PLUGIN_PROCESS)
-    deleteAllValues(m_pendingGetSitesWithData);
     m_pendingGetSitesWithData.clear();
-    deleteAllValues(m_pendingClearSiteData);
     m_pendingClearSiteData.clear();
 #endif
 }
@@ -162,7 +160,7 @@ void WebPluginSiteDataManager::getSitesWithData(PassRefPtr<ArrayCallback> prpCal
     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();
@@ -183,7 +181,7 @@ void WebPluginSiteDataManager::didGetSitesWithData(const Vector<String>& sites,
         return;
     }
 
-    Vector<RefPtr<APIObject> > sitesWK(sites.size());
+    Vector<RefPtr<APIObject>> sitesWK(sites.size());
 
     for (size_t i = 0; i < sites.size(); ++i)
         sitesWK[i] = WebString::create(sites[i]);
@@ -222,7 +220,7 @@ void WebPluginSiteDataManager::clearSiteData(ImmutableArray* sites, uint64_t fla
     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::didGetSitesWithDataForSinglePlugin(const Vector<S
 
 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::didClearSiteDataForSinglePlugin(uint64_t callback
 
 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);