<!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>[164810] trunk/Source/WebKit2</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/164810">164810</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-27 10:09:04 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Look up already existing VisitedLinkTableController objects by identifier
https://bugs.webkit.org/show_bug.cgi?id=129431
Reviewed by Dan Bernstein.
* WebProcess/WebPage/VisitedLinkTableController.cpp:
(WebKit::visitedLinkTableControllers):
(WebKit::VisitedLinkTableController::getOrCreate):
(WebKit::VisitedLinkTableController::VisitedLinkTableController):
(WebKit::VisitedLinkTableController::~VisitedLinkTableController):
* WebProcess/WebPage/VisitedLinkTableController.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllerh">trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164809 => 164810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-27 18:07:12 UTC (rev 164809)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-27 18:09:04 UTC (rev 164810)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-27 Anders Carlsson <andersca@apple.com>
+
+ Look up already existing VisitedLinkTableController objects by identifier
+ https://bugs.webkit.org/show_bug.cgi?id=129431
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebPage/VisitedLinkTableController.cpp:
+ (WebKit::visitedLinkTableControllers):
+ (WebKit::VisitedLinkTableController::getOrCreate):
+ (WebKit::VisitedLinkTableController::VisitedLinkTableController):
+ (WebKit::VisitedLinkTableController::~VisitedLinkTableController):
+ * WebProcess/WebPage/VisitedLinkTableController.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+
</ins><span class="cx"> 2014-02-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][WK2] Blocks when fetching plugins information
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (164809 => 164810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2014-02-27 18:07:12 UTC (rev 164809)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2014-02-27 18:09:04 UTC (rev 164810)
</span><span class="lines">@@ -27,22 +27,41 @@
</span><span class="cx"> #include "VisitedLinkTableController.h"
</span><span class="cx">
</span><span class="cx"> #include "WebProcess.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<VisitedLinkTableController> VisitedLinkTableController::create()
</del><ins>+static HashMap<uint64_t, VisitedLinkTableController*>& visitedLinkTableControllers()
</ins><span class="cx"> {
</span><del>- return adoptRef(new VisitedLinkTableController);
</del><ins>+ static NeverDestroyed<HashMap<uint64_t, VisitedLinkTableController*>> visitedLinkTableControllers;
+
+ return visitedLinkTableControllers;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-VisitedLinkTableController::VisitedLinkTableController()
</del><ins>+PassRefPtr<VisitedLinkTableController> VisitedLinkTableController::getOrCreate(uint64_t identifier)
</ins><span class="cx"> {
</span><ins>+ auto& visitedLinkTableControllerPtr = visitedLinkTableControllers().add(identifier, nullptr).iterator->value;
+ if (visitedLinkTableControllerPtr)
+ return visitedLinkTableControllerPtr;
+
+ RefPtr<VisitedLinkTableController> visitedLinkTableController = adoptRef(new VisitedLinkTableController(identifier));
+ visitedLinkTableControllerPtr = visitedLinkTableController.get();
+
+ return visitedLinkTableController.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+VisitedLinkTableController::VisitedLinkTableController(uint64_t identifier)
+ : m_identifier(identifier)
+{
+}
+
</ins><span class="cx"> VisitedLinkTableController::~VisitedLinkTableController()
</span><span class="cx"> {
</span><ins>+ ASSERT(visitedLinkTableControllers().contains(m_identifier));
+
+ visitedLinkTableControllers().remove(m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool VisitedLinkTableController::isLinkVisited(Page&, LinkHash linkHash, const URL&, const AtomicString&)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.h (164809 => 164810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.h 2014-02-27 18:07:12 UTC (rev 164809)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.h 2014-02-27 18:09:04 UTC (rev 164810)
</span><span class="lines">@@ -32,14 +32,16 @@
</span><span class="cx">
</span><span class="cx"> class VisitedLinkTableController final : public WebCore::VisitedLinkStore {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<VisitedLinkTableController> create();
</del><ins>+ static PassRefPtr<VisitedLinkTableController> getOrCreate(uint64_t identifier);
</ins><span class="cx"> virtual ~VisitedLinkTableController();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- VisitedLinkTableController();
</del><ins>+ explicit VisitedLinkTableController(uint64_t identifier);
</ins><span class="cx">
</span><span class="cx"> virtual bool isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL) override;
</span><span class="cx"> virtual void addVisitedLink(WebCore::Page&, WebCore::LinkHash) override;
</span><ins>+
+ uint64_t m_identifier;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namepsace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164809 => 164810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-27 18:07:12 UTC (rev 164809)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-27 18:09:04 UTC (rev 164810)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageClients.progressTrackerClient = new WebProgressTrackerClient(*this);
</span><span class="cx">
</span><del>- pageClients.visitedLinkStore = VisitedLinkTableController::create();
</del><ins>+ pageClients.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
</ins><span class="cx">
</span><span class="cx"> m_page = adoptPtr(new Page(pageClients));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>