<!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>[168122] trunk</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/168122">168122</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 14:53:47 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>window.testRunner.keepWebHistory() should update the UI process state
https://bugs.webkit.org/show_bug.cgi?id=132440
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetAddsVisitedLinks):
(WKPageSetAddsVisitedLinks):
* UIProcess/API/C/WKPagePrivate.h:
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::postSetAddsVisitedLinks):
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::keepWebHistory):
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::invoke):
(WTR::TestInvocation::didReceiveMessageFromInjectedBundle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-01 Anders Carlsson <andersca@apple.com>
+
+ window.testRunner.keepWebHistory() should update the UI process state
+ https://bugs.webkit.org/show_bug.cgi?id=132440
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetAddsVisitedLinks):
+ (WKPageSetAddsVisitedLinks):
+ * UIProcess/API/C/WKPagePrivate.h:
+
</ins><span class="cx"> 2014-05-01 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r60161.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -1787,6 +1787,16 @@
</span><span class="cx"> toImpl(page)->setScrollPinningBehavior(corePinning);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKPageGetAddsVisitedLinks(WKPageRef page)
+{
+ return toImpl(page)->addsVisitedLinks();
+}
+
+void WKPageSetAddsVisitedLinks(WKPageRef page, bool addsVisitedLinks)
+{
+ toImpl(page)->setAddsVisitedLinks(addsVisitedLinks);
+}
+
</ins><span class="cx"> void WKPageSetInvalidMessageFunction(WKPageInvalidMessageFunction)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Remove this function when doing so won't break WebKit nightlies.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -111,6 +111,9 @@
</span><span class="cx"> WK_EXPORT WKScrollPinningBehavior WKPageGetScrollPinningBehavior(WKPageRef page);
</span><span class="cx"> WK_EXPORT void WKPageSetScrollPinningBehavior(WKPageRef page, WKScrollPinningBehavior pinning);
</span><span class="cx">
</span><ins>+WK_EXPORT bool WKPageGetAddsVisitedLinks(WKPageRef page);
+WK_EXPORT void WKPageSetAddsVisitedLinks(WKPageRef page, bool visitedLinks);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Tools/ChangeLog 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-01 Anders Carlsson <andersca@apple.com>
+
+ window.testRunner.keepWebHistory() should update the UI process state
+ https://bugs.webkit.org/show_bug.cgi?id=132440
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::postSetAddsVisitedLinks):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::keepWebHistory):
+ * WebKitTestRunner/TestInvocation.cpp:
+ (WTR::TestInvocation::invoke):
+ (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
+
</ins><span class="cx"> 2014-05-01 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Really remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -238,7 +238,6 @@
</span><span class="cx"> m_textInputController = TextInputController::create();
</span><span class="cx"> m_accessibilityController = AccessibilityController::create();
</span><span class="cx">
</span><del>- WKBundleSetShouldTrackVisitedLinks(m_bundle, false);
</del><span class="cx"> WKBundleRemoveAllVisitedLinks(m_bundle);
</span><span class="cx"> WKBundleSetAllowUniversalAccessFromFileURLs(m_bundle, m_pageGroup, true);
</span><span class="cx"> WKBundleSetJavaScriptCanAccessClipboard(m_bundle, m_pageGroup, true);
</span><span class="lines">@@ -381,6 +380,13 @@
</span><span class="cx"> WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InjectedBundle::postSetAddsVisitedLinks(bool addsVisitedLinks)
+{
+ WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetAddsVisitedLinks"));
+ WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(addsVisitedLinks));
+ WKBundlePostMessage(m_bundle, messageName.get(), messageBody.get());
+}
+
</ins><span class="cx"> void InjectedBundle::setGeolocationPermission(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetGeolocationPermission"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> void postSetBackingScaleFactor(double);
</span><span class="cx"> void postSetWindowIsKey(bool);
</span><span class="cx"> void postSimulateWebNotificationClick(uint64_t notificationID);
</span><ins>+ void postSetAddsVisitedLinks(bool);
</ins><span class="cx">
</span><span class="cx"> // Geolocation.
</span><span class="cx"> void setGeolocationPermission(bool);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::keepWebHistory()
</span><span class="cx"> {
</span><del>- WKBundleSetShouldTrackVisitedLinks(InjectedBundle::shared().bundle(), true);
</del><ins>+ InjectedBundle::shared().postSetAddsVisitedLinks(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::execCommand(JSStringRef name, JSStringRef argument)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (168121 => 168122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-05-01 21:00:19 UTC (rev 168121)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2014-05-01 21:53:47 UTC (rev 168122)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <WebKit2/WKData.h>
</span><span class="cx"> #include <WebKit2/WKDictionary.h>
</span><span class="cx"> #include <WebKit2/WKInspector.h>
</span><ins>+#include <WebKit2/WKPagePrivate.h>
</ins><span class="cx"> #include <WebKit2/WKRetainPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -208,6 +209,8 @@
</span><span class="cx"> updateLayoutType(m_pathOrURL.c_str());
</span><span class="cx"> updateThreadedScrollingForCurrentTest(m_pathOrURL.c_str());
</span><span class="cx">
</span><ins>+ WKPageSetAddsVisitedLinks(TestController::shared().mainWebView()->page(), false);
+
</ins><span class="cx"> m_textOutput.clear();
</span><span class="cx">
</span><span class="cx"> TestController::shared().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks(m_pathOrURL.c_str()));
</span><span class="lines">@@ -470,6 +473,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (WKStringIsEqualToUTF8CString(messageName, "SetAddsVisitedLinks")) {
+ ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
+ WKBooleanRef enabledWK = static_cast<WKBooleanRef>(messageBody);
+ WKPageSetAddsVisitedLinks(TestController::shared().mainWebView()->page(), WKBooleanGetValue(enabledWK));
+ return;
+ }
+
</ins><span class="cx"> if (WKStringIsEqualToUTF8CString(messageName, "SetGeolocationPermission")) {
</span><span class="cx"> ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
</span><span class="cx"> WKBooleanRef enabledWK = static_cast<WKBooleanRef>(messageBody);
</span></span></pre>
</div>
</div>
</body>
</html>