<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168290] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168290">168290</a></dd>
<dt>Author</dt> <dd>mhock@apple.com</dd>
<dt>Date</dt> <dd>2014-05-05 09:49:33 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Session-aware plugin autostart data
https://bugs.webkit.org/show_bug.cgi?id=131758
<rdar://problem/15906540>
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::userDidClickSnapshot):
* page/PlugInClient.h:
Source/WebKit2:
* Shared/WebProcessCreationParameters.cpp:
* Shared/WebProcessCreationParameters.h:
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
(WebKit::PlugInAutoStartProvider::PlugInAutoStartProvider):
(WebKit::PlugInAutoStartProvider::addAutoStartOriginHash):
(WebKit::PlugInAutoStartProvider::autoStartOriginHashesCopy):
(WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
(WebKit::PlugInAutoStartProvider::setAutoStartOriginsTableWithItemsPassingTest):
(WebKit::PlugInAutoStartProvider::setAutoStartOriginsArray):
(WebKit::PlugInAutoStartProvider::didReceiveUserInteraction):
* UIProcess/Plugins/PlugInAutoStartProvider.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::addPlugInAutoStartOriginHash):
(WebKit::WebContext::plugInDidReceiveUserInteraction):
* UIProcess/WebContext.h:
* UIProcess/WebContext.messages.in:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::pluginDidReceiveUserInteraction):
* WebProcess/WebCoreSupport/WebPlugInClient.cpp:
(WebKit::WebPlugInClient::didStartFromOrigin):
* WebProcess/WebCoreSupport/WebPlugInClient.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::isPlugInAutoStartOriginHash):
(WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
(WebKit::WebProcess::plugInDidStartFromOrigin):
(WebKit::WebProcess::didAddPlugInAutoStartOriginHash):
(WebKit::WebProcess::resetPlugInAutoStartOriginDefaultHashes):
(WebKit::WebProcess::resetPlugInAutoStartOriginHashes):
(WebKit::WebProcess::plugInDidReceiveUserInteraction):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePlugInClienth">trunk/Source/WebCore/page/PlugInClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProviderh">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextmessagesin">trunk/Source/WebKit2/UIProcess/WebContext.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebCore/ChangeLog 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-05 Martin Hock <mhock@apple.com>
+
+ Session-aware plugin autostart data
+ https://bugs.webkit.org/show_bug.cgi?id=131758
+ <rdar://problem/15906540>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::userDidClickSnapshot):
+ * page/PlugInClient.h:
+
</ins><span class="cx"> 2014-05-05 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Elements with overflow:auto are not painted inside regions when following a float
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx">
</span><span class="cx"> String plugInOrigin = m_loadedUrl.host();
</span><span class="cx"> if (document().page() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(document().page()->mainFrame().document()->baseURL().protocol()) && document().page()->settings().autostartOriginPlugInSnapshottingEnabled())
</span><del>- document().page()->plugInClient()->didStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), plugInOrigin, loadedMimeType());
</del><ins>+ document().page()->plugInClient()->didStartFromOrigin(document().page()->mainFrame().document()->baseURL().host(), plugInOrigin, loadedMimeType(), document().page()->sessionID());
</ins><span class="cx">
</span><span class="cx"> LOG(Plugins, "%p User clicked on snapshotted plug-in. Restart.", this);
</span><span class="cx"> restartSnapshottedPlugIn();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePlugInClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PlugInClient.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PlugInClient.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebCore/page/PlugInClient.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef PlugInClient_h
</span><span class="cx"> #define PlugInClient_h
</span><span class="cx">
</span><ins>+#include "SessionID.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -34,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual void pageDestroyed() = 0;
</span><span class="cx"> virtual bool shouldAutoStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType) = 0;
</span><del>- virtual void didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType) = 0;
</del><ins>+ virtual void didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, SessionID) = 0;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~PlugInClient() { }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-05-05 Martin Hock <mhock@apple.com>
+
+ Session-aware plugin autostart data
+ https://bugs.webkit.org/show_bug.cgi?id=131758
+ <rdar://problem/15906540>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+ (WebKit::PlugInAutoStartProvider::PlugInAutoStartProvider):
+ (WebKit::PlugInAutoStartProvider::addAutoStartOriginHash):
+ (WebKit::PlugInAutoStartProvider::autoStartOriginHashesCopy):
+ (WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
+ (WebKit::PlugInAutoStartProvider::setAutoStartOriginsTableWithItemsPassingTest):
+ (WebKit::PlugInAutoStartProvider::setAutoStartOriginsArray):
+ (WebKit::PlugInAutoStartProvider::didReceiveUserInteraction):
+ * UIProcess/Plugins/PlugInAutoStartProvider.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::addPlugInAutoStartOriginHash):
+ (WebKit::WebContext::plugInDidReceiveUserInteraction):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebContext.messages.in:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::pluginDidReceiveUserInteraction):
+ * WebProcess/WebCoreSupport/WebPlugInClient.cpp:
+ (WebKit::WebPlugInClient::didStartFromOrigin):
+ * WebProcess/WebCoreSupport/WebPlugInClient.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::isPlugInAutoStartOriginHash):
+ (WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
+ (WebKit::WebProcess::plugInDidStartFromOrigin):
+ (WebKit::WebProcess::didAddPlugInAutoStartOriginHash):
+ (WebKit::WebProcess::resetPlugInAutoStartOriginDefaultHashes):
+ (WebKit::WebProcess::resetPlugInAutoStartOriginHashes):
+ (WebKit::WebProcess::plugInDidReceiveUserInteraction):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2014-05-05 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Another iOS build fix after r168260.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx">
</span><span class="cx"> #include "APIData.h"
</span><del>-#include "ArgumentCoders.h"
</del><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><ins>+#include <WebCore/SessionIDHash.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="lines">@@ -150,7 +151,7 @@
</span><span class="cx"> bool usesNetworkProcess;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- HashMap<unsigned, double> plugInAutoStartOriginHashes;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, double>> plugInAutoStartOriginHashes;
</ins><span class="cx"> Vector<String> plugInAutoStartOrigins;
</span><span class="cx">
</span><span class="cx"> bool memoryCacheDisabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> PlugInAutoStartProvider::PlugInAutoStartProvider(WebContext* context)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><ins>+ m_hashToOriginMap.add(SessionID::defaultSessionID(), HashMap<unsigned, String>());
+ m_autoStartTable.add(SessionID::defaultSessionID(), AutoStartTable());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static double expirationTimeFromNow()
</span><span class="lines">@@ -49,51 +51,55 @@
</span><span class="cx"> return currentTime() + plugInAutoStartExpirationTimeThreshold;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PlugInAutoStartProvider::addAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash)
</del><ins>+void PlugInAutoStartProvider::addAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- if (m_hashToOriginMap.contains(plugInOriginHash))
</del><ins>+ auto sessionIterator = m_hashToOriginMap.find(sessionID);
+ if (sessionIterator == m_hashToOriginMap.end()) {
+ if (m_hashToOriginMap.get(SessionID::defaultSessionID()).contains(plugInOriginHash))
+ return;
+ sessionIterator = m_hashToOriginMap.set(sessionID, HashMap<unsigned, String>()).iterator;
+ } else if (sessionIterator->value.contains(plugInOriginHash) || m_hashToOriginMap.get(SessionID::defaultSessionID()).contains(plugInOriginHash))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- AutoStartTable::iterator it = m_autoStartTable.find(pageOrigin);
- if (it == m_autoStartTable.end())
- it = m_autoStartTable.add(pageOrigin, PlugInAutoStartOriginHash()).iterator;
</del><ins>+ AutoStartTable::iterator it = m_autoStartTable.add(sessionID, AutoStartTable()).iterator->value.add(pageOrigin, PlugInAutoStartOriginMap()).iterator;
</ins><span class="cx">
</span><span class="cx"> double expirationTime = expirationTimeFromNow();
</span><span class="cx"> it->value.set(plugInOriginHash, expirationTime);
</span><del>- m_hashToOriginMap.set(plugInOriginHash, pageOrigin);
</del><ins>+ sessionIterator->value.set(plugInOriginHash, pageOrigin);
</ins><span class="cx">
</span><del>- m_context->sendToAllProcesses(Messages::WebProcess::DidAddPlugInAutoStartOriginHash(plugInOriginHash, expirationTime));
- m_context->client().plugInAutoStartOriginHashesChanged(m_context);
</del><ins>+ m_context->sendToAllProcesses(Messages::WebProcess::DidAddPlugInAutoStartOriginHash(plugInOriginHash, expirationTime, sessionID));
+
+ if (!sessionID.isEphemeral())
+ m_context->client().plugInAutoStartOriginHashesChanged(m_context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PlugInAutoStartOriginHash PlugInAutoStartProvider::autoStartOriginHashesCopy() const
</del><ins>+SessionPlugInAutoStartOriginMap PlugInAutoStartProvider::autoStartOriginHashesCopy() const
</ins><span class="cx"> {
</span><del>- PlugInAutoStartOriginHash copyMap;
- AutoStartTable::const_iterator end = m_autoStartTable.end();
- for (AutoStartTable::const_iterator it = m_autoStartTable.begin(); it != end; ++it) {
- PlugInAutoStartOriginHash::const_iterator mapEnd = it->value.end();
- for (PlugInAutoStartOriginHash::const_iterator mapIt = it->value.begin(); mapIt != mapEnd; ++mapIt)
- copyMap.set(mapIt->key, mapIt->value);
</del><ins>+ SessionPlugInAutoStartOriginMap sessionMap;
+
+ for (const auto& sessionKeyOriginHash : m_autoStartTable) {
+ PlugInAutoStartOriginMap& map = sessionMap.add(sessionKeyOriginHash.key, PlugInAutoStartOriginMap()).iterator->value;
+ for (const auto& keyOriginHash : sessionKeyOriginHash.value) {
+ for (const auto& originHash : keyOriginHash.value)
+ map.set(originHash.key, originHash.value);
+ }
</ins><span class="cx"> }
</span><del>- return copyMap;
</del><ins>+ return sessionMap;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ImmutableDictionary> PlugInAutoStartProvider::autoStartOriginsTableCopy() const
</span><span class="cx"> {
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><del>- AutoStartTable::const_iterator end = m_autoStartTable.end();
</del><ins>+
</ins><span class="cx"> double now = currentTime();
</span><del>- for (AutoStartTable::const_iterator it = m_autoStartTable.begin(); it != end; ++it) {
</del><ins>+ for (const auto& stringOriginHash : m_autoStartTable.get(SessionID::defaultSessionID())) {
</ins><span class="cx"> ImmutableDictionary::MapType hashMap;
</span><del>- PlugInAutoStartOriginHash::const_iterator valueEnd = it->value.end();
- for (PlugInAutoStartOriginHash::const_iterator valueIt = it->value.begin(); valueIt != valueEnd; ++valueIt) {
- if (now > valueIt->value)
- continue;
- hashMap.set(String::number(valueIt->key), API::Double::create(valueIt->value));
</del><ins>+ for (const auto& originHash : stringOriginHash.value) {
+ if (now <= originHash.value)
+ hashMap.set(String::number(originHash.key), API::Double::create(originHash.value));
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> if (hashMap.size())
</span><del>- map.set(it->key, ImmutableDictionary::create(std::move(hashMap)));
</del><ins>+ map.set(stringOriginHash.key, ImmutableDictionary::create(std::move(hashMap)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return ImmutableDictionary::create(std::move(map));
</span><span class="lines">@@ -121,58 +127,64 @@
</span><span class="cx"> m_hashToOriginMap.clear();
</span><span class="cx"> m_autoStartTable.clear();
</span><span class="cx"> HashMap<unsigned, double> hashMap;
</span><ins>+ HashMap<unsigned, String>& hashToOriginMap = m_hashToOriginMap.add(SessionID::defaultSessionID(), HashMap<unsigned, String>()).iterator->value;
+ AutoStartTable& ast = m_autoStartTable.add(SessionID::defaultSessionID(), AutoStartTable()).iterator->value;
</ins><span class="cx">
</span><del>- ImmutableDictionary::MapType::const_iterator end = table.map().end();
- for (ImmutableDictionary::MapType::const_iterator it = table.map().begin(); it != end; ++it) {
- PlugInAutoStartOriginHash hashes;
- ImmutableDictionary* hashesForPage = static_cast<ImmutableDictionary*>(it->value.get());
- ImmutableDictionary::MapType::const_iterator hashEnd = hashesForPage->map().end();
- for (ImmutableDictionary::MapType::const_iterator hashIt = hashesForPage->map().begin(); hashIt != hashEnd; ++hashIt) {
</del><ins>+ for (auto& strDict : table.map()) {
+ PlugInAutoStartOriginMap hashes;
+ for (auto& hashTime : static_cast<ImmutableDictionary*>(strDict.value.get())->map()) {
</ins><span class="cx"> bool ok;
</span><del>- unsigned hash = hashIt->key.toUInt(&ok);
</del><ins>+ unsigned hash = hashTime.key.toUInt(&ok);
</ins><span class="cx"> if (!ok)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (hashIt->value->type() != API::Double::APIType)
</del><ins>+ if (hashTime.value->type() != API::Double::APIType)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- double expirationTime = static_cast<API::Double*>(hashIt->value.get())->value();
</del><ins>+ double expirationTime = static_cast<API::Double*>(hashTime.value.get())->value();
</ins><span class="cx"> if (!isExpirationTimeAcceptable(expirationTime))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> hashes.set(hash, expirationTime);
</span><span class="cx"> hashMap.set(hash, expirationTime);
</span><del>- m_hashToOriginMap.set(hash, it->key);
</del><ins>+ hashToOriginMap.set(hash, strDict.key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!hashes.isEmpty())
</span><del>- m_autoStartTable.set(it->key, hashes);
</del><ins>+ ast.set(strDict.key, hashes);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_context->sendToAllProcesses(Messages::WebProcess::ResetPlugInAutoStartOriginHashes(hashMap));
</del><ins>+ m_context->sendToAllProcesses(Messages::WebProcess::ResetPlugInAutoStartOriginDefaultHashes(hashMap));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlugInAutoStartProvider::setAutoStartOriginsArray(API::Array& originList)
</span><span class="cx"> {
</span><span class="cx"> m_autoStartOrigins.clear();
</span><del>- for (size_t i = 0, length = originList.size(); i < length; ++i) {
- if (originList.at(i)->type() != API::String::APIType)
- continue;
- m_autoStartOrigins.append(static_cast<API::String*>(originList.at(i))->string());
- }
</del><ins>+ for (const auto& string : originList.elementsOfType<API::String>())
+ m_autoStartOrigins.append(string->string());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PlugInAutoStartProvider::didReceiveUserInteraction(unsigned plugInOriginHash)
</del><ins>+void PlugInAutoStartProvider::didReceiveUserInteraction(unsigned plugInOriginHash, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- HashMap<unsigned, String>::const_iterator it = m_hashToOriginMap.find(plugInOriginHash);
- if (it == m_hashToOriginMap.end()) {
- ASSERT_NOT_REACHED();
- return;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, String>>::const_iterator sessionIterator = m_hashToOriginMap.find(sessionID);
+ HashMap<unsigned, String>::const_iterator it;
+ bool contains = false;
+ if (sessionIterator != m_hashToOriginMap.end()) {
+ it = sessionIterator->value.find(plugInOriginHash);
+ contains = it != sessionIterator->value.end();
</ins><span class="cx"> }
</span><ins>+ if (!contains) {
+ sessionIterator = m_hashToOriginMap.find(SessionID::defaultSessionID());
+ it = sessionIterator->value.find(plugInOriginHash);
+ if (it == sessionIterator->value.end()) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> double newExpirationTime = expirationTimeFromNow();
</span><del>- m_autoStartTable.find(it->value)->value.set(plugInOriginHash, newExpirationTime);
- m_context->sendToAllProcesses(Messages::WebProcess::DidAddPlugInAutoStartOriginHash(plugInOriginHash, newExpirationTime));
</del><ins>+ m_autoStartTable.add(sessionID, AutoStartTable()).iterator->value.add(it->value, PlugInAutoStartOriginMap()).iterator->value.set(plugInOriginHash, newExpirationTime);
+ m_context->sendToAllProcesses(Messages::WebProcess::DidAddPlugInAutoStartOriginHash(plugInOriginHash, newExpirationTime, sessionID));
</ins><span class="cx"> m_context->client().plugInAutoStartOriginHashesChanged(m_context);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef PlugInAutoStartProvider_h
</span><span class="cx"> #define PlugInAutoStartProvider_h
</span><span class="cx">
</span><ins>+#include <WebCore/SessionIDHash.h>
</ins><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -43,7 +44,8 @@
</span><span class="cx"> class ImmutableDictionary;
</span><span class="cx"> class WebContext;
</span><span class="cx">
</span><del>-typedef HashMap<unsigned, double> PlugInAutoStartOriginHash;
</del><ins>+typedef HashMap<unsigned, double> PlugInAutoStartOriginMap;
+typedef HashMap<WebCore::SessionID, PlugInAutoStartOriginMap> SessionPlugInAutoStartOriginMap;
</ins><span class="cx"> typedef Vector<String> PlugInAutoStartOrigins;
</span><span class="cx">
</span><span class="cx"> class PlugInAutoStartProvider {
</span><span class="lines">@@ -51,15 +53,15 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit PlugInAutoStartProvider(WebContext*);
</span><span class="cx">
</span><del>- void addAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash);
- void didReceiveUserInteraction(unsigned plugInOriginHash);
</del><ins>+ void addAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash, WebCore::SessionID);
+ void didReceiveUserInteraction(unsigned plugInOriginHash, WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<ImmutableDictionary> autoStartOriginsTableCopy() const;
</span><span class="cx"> void setAutoStartOriginsTable(ImmutableDictionary&);
</span><span class="cx"> void setAutoStartOriginsFilteringOutEntriesAddedAfterTime(ImmutableDictionary&, double time);
</span><span class="cx"> void setAutoStartOriginsArray(API::Array&);
</span><span class="cx">
</span><del>- PlugInAutoStartOriginHash autoStartOriginHashesCopy() const;
</del><ins>+ SessionPlugInAutoStartOriginMap autoStartOriginHashesCopy() const;
</ins><span class="cx"> const PlugInAutoStartOrigins& autoStartOrigins() const { return m_autoStartOrigins; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -67,10 +69,11 @@
</span><span class="cx">
</span><span class="cx"> void setAutoStartOriginsTableWithItemsPassingTest(ImmutableDictionary&, std::function<bool(double expirationTimestamp)>);
</span><span class="cx">
</span><del>- typedef HashMap<String, PlugInAutoStartOriginHash, CaseFoldingHash> AutoStartTable;
- AutoStartTable m_autoStartTable;
</del><ins>+ typedef HashMap<String, PlugInAutoStartOriginMap, CaseFoldingHash> AutoStartTable;
+ typedef HashMap<WebCore::SessionID, AutoStartTable> SessionAutoStartTable;
+ SessionAutoStartTable m_autoStartTable;
</ins><span class="cx">
</span><del>- HashMap<unsigned, String> m_hashToOriginMap;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, String>> m_hashToOriginMap;
</ins><span class="cx">
</span><span class="cx"> PlugInAutoStartOrigins m_autoStartOrigins;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1318,14 +1318,14 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetJavaScriptGarbageCollectorTimerEnabled(flag));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash)
</del><ins>+void WebContext::addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- m_plugInAutoStartProvider.addAutoStartOriginHash(pageOrigin, plugInOriginHash);
</del><ins>+ m_plugInAutoStartProvider.addAutoStartOriginHash(pageOrigin, plugInOriginHash, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::plugInDidReceiveUserInteraction(unsigned plugInOriginHash)
</del><ins>+void WebContext::plugInDidReceiveUserInteraction(unsigned plugInOriginHash, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- m_plugInAutoStartProvider.didReceiveUserInteraction(plugInOriginHash);
</del><ins>+ m_plugInAutoStartProvider.didReceiveUserInteraction(plugInOriginHash, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ImmutableDictionary> WebContext::plugInAutoStartOriginHashes() const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -422,8 +422,8 @@
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash);
- void plugInDidReceiveUserInteraction(unsigned plugInOriginHash);
</del><ins>+ void addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash, WebCore::SessionID);
+ void plugInDidReceiveUserInteraction(unsigned plugInOriginHash, WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> void setAnyPageGroupMightHavePrivateBrowsingEnabled(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.messages.in (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -59,6 +59,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Plug-in messages.
</span><del>- void AddPlugInAutoStartOriginHash(String pageOrigin, uint32_t hash)
- void PlugInDidReceiveUserInteraction(uint32_t hash)
</del><ins>+ void AddPlugInAutoStartOriginHash(String pageOrigin, uint32_t hash, WebCore::SessionID sessionID)
+ void PlugInDidReceiveUserInteraction(uint32_t hash, WebCore::SessionID sessionID)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1736,7 +1736,7 @@
</span><span class="cx"> String pluginOrigin = plugInImageElement->loadedUrl().host();
</span><span class="cx"> String mimeType = plugInImageElement->loadedMimeType();
</span><span class="cx">
</span><del>- WebProcess::shared().plugInDidReceiveUserInteraction(pageOrigin, pluginOrigin, mimeType);
</del><ins>+ WebProcess::shared().plugInDidReceiveUserInteraction(pageOrigin, pluginOrigin, mimeType, plugInImageElement->document().page()->sessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PluginView::shouldCreateTransientPaintingSnapshot() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> return WebProcess::shared().shouldPlugInAutoStartFromOrigin(m_page, pageOrigin, pluginOrigin, mimeType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlugInClient::didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</del><ins>+void WebPlugInClient::didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID sessionID)
</ins><span class="cx"> {
</span><del>- WebProcess::shared().plugInDidStartFromOrigin(pageOrigin, pluginOrigin, mimeType);
</del><ins>+ WebProcess::shared().plugInDidStartFromOrigin(pageOrigin, pluginOrigin, mimeType, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlugInClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlugInClient.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebPlugInClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/PlugInClient.h>
</span><ins>+#include <WebCore/SessionID.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void pageDestroyed();
</span><span class="cx"> virtual bool shouldAutoStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</span><del>- virtual void didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</del><ins>+ virtual void didStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> WebPage* m_page;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009, 2010, 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009, 2010, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> #if USE(SOUP) && !ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> addSupplement<WebSoupRequestManager>();
</span><span class="cx"> #endif
</span><ins>+ m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
</span><span class="lines">@@ -726,11 +727,22 @@
</span><span class="cx"> return hasher.hash();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebProcess::isPlugInAutoStartOriginHash(unsigned plugInOriginHash)
</del><ins>+bool WebProcess::isPlugInAutoStartOriginHash(unsigned plugInOriginHash, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- HashMap<unsigned, double>::const_iterator it = m_plugInAutoStartOriginHashes.find(plugInOriginHash);
- if (it == m_plugInAutoStartOriginHashes.end())
- return false;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, double>>::const_iterator sessionIterator = m_plugInAutoStartOriginHashes.find(sessionID);
+ HashMap<unsigned, double>::const_iterator it;
+ bool contains = false;
+
+ if (sessionIterator != m_plugInAutoStartOriginHashes.end()) {
+ it = sessionIterator->value.find(plugInOriginHash);
+ contains = it != sessionIterator->value.end();
+ }
+ if (!contains) {
+ sessionIterator = m_plugInAutoStartOriginHashes.find(SessionID::defaultSessionID());
+ it = sessionIterator->value.find(plugInOriginHash);
+ if (it == sessionIterator->value.end())
+ return false;
+ }
</ins><span class="cx"> return currentTime() < it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -748,10 +760,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Lastly check against the more explicit hash list.
</span><del>- return isPlugInAutoStartOriginHash(hashForPlugInOrigin(pageOrigin, pluginOrigin, mimeType));
</del><ins>+ return isPlugInAutoStartOriginHash(hashForPlugInOrigin(pageOrigin, pluginOrigin, mimeType), page->sessionID());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</del><ins>+void WebProcess::plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> if (pageOrigin.isEmpty()) {
</span><span class="cx"> LOG(Plugins, "Not adding empty page origin");
</span><span class="lines">@@ -759,7 +771,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned plugInOriginHash = hashForPlugInOrigin(pageOrigin, pluginOrigin, mimeType);
</span><del>- if (isPlugInAutoStartOriginHash(plugInOriginHash)) {
</del><ins>+ if (isPlugInAutoStartOriginHash(plugInOriginHash, sessionID)) {
</ins><span class="cx"> LOG(Plugins, "Hash %x already exists as auto-start origin (request for %s)", plugInOriginHash, pageOrigin.utf8().data());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -768,26 +780,32 @@
</span><span class="cx"> // comes back from the parent process. Temporarily add this hash to the list with a thirty
</span><span class="cx"> // second timeout. That way, even if the parent decides not to add it, we'll only be
</span><span class="cx"> // incorrect for a little while.
</span><del>- m_plugInAutoStartOriginHashes.set(plugInOriginHash, currentTime() + 30 * 1000);
</del><ins>+ m_plugInAutoStartOriginHashes.add(sessionID, HashMap<unsigned, double>()).iterator->value.set(plugInOriginHash, currentTime() + 30 * 1000);
</ins><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::WebContext::AddPlugInAutoStartOriginHash(pageOrigin, plugInOriginHash), 0);
</del><ins>+ parentProcessConnection()->send(Messages::WebContext::AddPlugInAutoStartOriginHash(pageOrigin, plugInOriginHash, sessionID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::didAddPlugInAutoStartOriginHash(unsigned plugInOriginHash, double expirationTime)
</del><ins>+void WebProcess::didAddPlugInAutoStartOriginHash(unsigned plugInOriginHash, double expirationTime, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> // When called, some web process (which also might be this one) added the origin for auto-starting,
</span><span class="cx"> // or received user interaction.
</span><span class="cx"> // Set the bit to avoid having redundantly call into the UI process upon user interaction.
</span><del>- m_plugInAutoStartOriginHashes.set(plugInOriginHash, expirationTime);
</del><ins>+ m_plugInAutoStartOriginHashes.add(sessionID, HashMap<unsigned, double>()).iterator->value.set(plugInOriginHash, expirationTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::resetPlugInAutoStartOriginHashes(const HashMap<unsigned, double>& hashes)
</del><ins>+void WebProcess::resetPlugInAutoStartOriginDefaultHashes(const HashMap<unsigned, double>& hashes)
</ins><span class="cx"> {
</span><del>- m_plugInAutoStartOriginHashes.swap(const_cast<HashMap<unsigned, double>&>(hashes));
</del><ins>+ m_plugInAutoStartOriginHashes.clear();
+ m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>()).iterator->value.swap(const_cast<HashMap<unsigned, double>&>(hashes));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType)
</del><ins>+void WebProcess::resetPlugInAutoStartOriginHashes(const HashMap<SessionID, HashMap<unsigned, double>>& hashes)
</ins><span class="cx"> {
</span><ins>+ m_plugInAutoStartOriginHashes.swap(const_cast<HashMap<SessionID, HashMap<unsigned, double>>&>(hashes));
+}
+
+void WebProcess::plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, SessionID sessionID)
+{
</ins><span class="cx"> if (pageOrigin.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -795,13 +813,24 @@
</span><span class="cx"> if (!plugInOriginHash)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- HashMap<unsigned, double>::iterator it = m_plugInAutoStartOriginHashes.find(plugInOriginHash);
- if (it == m_plugInAutoStartOriginHashes.end())
- return;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, double>>::const_iterator sessionIterator = m_plugInAutoStartOriginHashes.find(sessionID);
+ HashMap<unsigned, double>::const_iterator it;
+ bool contains = false;
+ if (sessionIterator != m_plugInAutoStartOriginHashes.end()) {
+ it = sessionIterator->value.find(plugInOriginHash);
+ contains = it != sessionIterator->value.end();
+ }
+ if (!contains) {
+ sessionIterator = m_plugInAutoStartOriginHashes.find(SessionID::defaultSessionID());
+ it = sessionIterator->value.find(plugInOriginHash);
+ if (it == sessionIterator->value.end())
+ return;
+ }
+
</ins><span class="cx"> if (it->value - currentTime() > plugInAutoStartExpirationTimeUpdateThreshold)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::WebContext::PlugInDidReceiveUserInteraction(plugInOriginHash), 0);
</del><ins>+ parentProcessConnection()->send(Messages::WebContext::PlugInDidReceiveUserInteraction(plugInOriginHash, sessionID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void fromCountedSetToHashMap(TypeCountSet* countedSet, HashMap<String, uint64_t>& map)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "ViewUpdateDispatcher.h"
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><del>-#include <WebCore/SessionID.h>
</del><ins>+#include <WebCore/SessionIDHash.h>
</ins><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -116,8 +116,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool shouldPlugInAutoStartFromOrigin(const WebPage*, const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</span><del>- void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
- void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType);
</del><ins>+ void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
+ void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
</ins><span class="cx">
</span><span class="cx"> bool fullKeyboardAccessEnabled() const { return m_fullKeyboardAccessEnabled; }
</span><span class="cx">
</span><span class="lines">@@ -214,9 +214,10 @@
</span><span class="cx"> void userPreferredLanguagesChanged(const Vector<String>&) const;
</span><span class="cx"> void fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled);
</span><span class="cx">
</span><del>- bool isPlugInAutoStartOriginHash(unsigned plugInOriginHash);
- void didAddPlugInAutoStartOriginHash(unsigned plugInOriginHash, double expirationTime);
- void resetPlugInAutoStartOriginHashes(const HashMap<unsigned, double>& hashes);
</del><ins>+ bool isPlugInAutoStartOriginHash(unsigned plugInOriginHash, WebCore::SessionID);
+ void didAddPlugInAutoStartOriginHash(unsigned plugInOriginHash, double expirationTime, WebCore::SessionID);
+ void resetPlugInAutoStartOriginDefaultHashes(const HashMap<unsigned, double>& hashes);
+ void resetPlugInAutoStartOriginHashes(const HashMap<WebCore::SessionID, HashMap<unsigned, double>>& hashes);
</ins><span class="cx">
</span><span class="cx"> void platformSetCacheModel(CacheModel);
</span><span class="cx"> void platformClearResourceCaches(ResourceCachesToClear);
</span><span class="lines">@@ -288,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_inDidClose;
</span><span class="cx">
</span><del>- HashMap<unsigned, double> m_plugInAutoStartOriginHashes;
</del><ins>+ HashMap<WebCore::SessionID, HashMap<unsigned, double>> m_plugInAutoStartOriginHashes;
</ins><span class="cx"> HashSet<String> m_plugInAutoStartOrigins;
</span><span class="cx">
</span><span class="cx"> bool m_hasSetCacheModel;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (168289 => 168290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-05-05 16:28:49 UTC (rev 168289)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-05-05 16:49:33 UTC (rev 168290)
</span><span class="lines">@@ -53,8 +53,9 @@
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span><span class="cx"> # Plug-ins.
</span><del>- DidAddPlugInAutoStartOriginHash(uint32_t hash, double expirationTime)
- ResetPlugInAutoStartOriginHashes(HashMap<uint32_t,double> hashes)
</del><ins>+ DidAddPlugInAutoStartOriginHash(uint32_t hash, double expirationTime, WebCore::SessionID sessionID)
+ ResetPlugInAutoStartOriginDefaultHashes(HashMap<uint32_t,double> hashes)
+ ResetPlugInAutoStartOriginHashes(HashMap<WebCore::SessionID, HashMap<uint32_t,double>> hashes)
</ins><span class="cx">
</span><span class="cx"> void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
</span><span class="cx"> void StopMemorySampler();
</span></span></pre>
</div>
</div>
</body>
</html>