From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 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 553ea727b..a26bbbdb8 100644 --- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp +++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp @@ -170,8 +170,7 @@ void WebPluginSiteDataManager::getSitesWithData(PassRefPtr prpCal for (size_t i = 0; i < plugins.size(); ++i) pluginPaths.append(plugins[i].path); - // FIXME (Multi-WebProcess): When multi-process is enabled, we must always use a plug-in process for this, - // so this code should just be removed. + ASSERT(m_webContext->processModel() == ProcessModelSharedSecondaryProcess); // Plugin process is required for multiple WebProcess mode. m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebProcess::GetSitesWithPluginData(pluginPaths, callbackID)); #endif } @@ -233,8 +232,7 @@ void WebPluginSiteDataManager::clearSiteData(ImmutableArray* sites, uint64_t fla for (size_t i = 0; i < plugins.size(); ++i) pluginPaths.append(plugins[i].path); - // FIXME (Multi-WebProcess): When multi-process is enabled, we must always use a plug-in process for this, - // so this code should just be removed. + ASSERT(m_webContext->processModel() == ProcessModelSharedSecondaryProcess); // Plugin process is required for multiple WebProcess mode. m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebProcess::ClearPluginSiteData(pluginPaths, sitesVector, flags, maxAgeInSeconds, callbackID)); #endif } -- cgit v1.2.1