From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 .../WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp')

diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
index dfa0806..5f56d0b 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
@@ -163,11 +163,7 @@ void WebPluginSiteDataManager::getSitesWithData(PassRefPtr<ArrayCallback> prpCal
     m_pendingGetSitesWithData.set(callbackID, state);
     state->getSitesWithDataForNextPlugin();
 #else
-    if (!m_webContext->hasValidProcess()) {
-        RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
-        callback->invalidate();
-        return;
-    }
+    m_webContext->relaunchProcessIfNecessary();
 
     Vector<String> pluginPaths;
     m_webContext->pluginInfoStore()->getPluginPaths(pluginPaths);
@@ -227,11 +223,7 @@ void WebPluginSiteDataManager::clearSiteData(ImmutableArray* sites, uint64_t fla
     state->clearSiteDataForNextPlugin();
 #else
 
-    if (!m_webContext->hasValidProcess()) {
-        RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
-        callback->invalidate();
-        return;
-    }
+    m_webContext->relaunchProcessIfNecessary();
     Vector<String> pluginPaths;
     m_webContext->pluginInfoStore()->getPluginPaths(pluginPaths);
     m_webContext->ensureWebProcess();    
-- 
cgit v1.1