<!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>[177515] trunk/Tools</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/177515">177515</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 12:25:21 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed gardening. Reorder file contents to match Mac version.
Reorder the contents of the TestRunnerWin so that it matches TestRunnerMac. This makes
it easier to see what steps are missing when running under Windows.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::callShouldCloseOnWebView):
(TestRunner::clearAllApplicationCaches):
(TestRunner::applicationCacheDiskUsageForOrigin):
(TestRunner::syncLocalStorage):
(TestRunner::localStorageDiskUsageForOrigin):
(TestRunner::observeStorageTrackerNotifications):
(TestRunner::clearApplicationCacheForOrigin):
(TestRunner::originsWithApplicationCache):
(TestRunner::clearAllDatabases):
(TestRunner::deleteAllLocalStorage):
(TestRunner::setStorageDatabaseIdleInterval):
(TestRunner::closeIdleLocalStorageDatabases):
(TestRunner::originsWithLocalStorage):
(TestRunner::deleteLocalStorageForOrigin):
(TestRunner::numberOfPendingGeolocationPermissionRequests):
(jsStringRefToWString):
(TestRunner::setAppCacheMaximumSize):
(TestRunner::setDatabaseQuota):
(TestRunner::goBack):
(TestRunner::setDefersLoading):
(TestRunner::setDomainRelaxationForbiddenForURLScheme):
(TestRunner::setAutomaticLinkDetectionEnabled):
(TestRunner::dispatchPendingLoadRequests):
(TestRunner::overridePreference):
(TestRunner::removeAllVisitedLinks):
(TestRunner::waitForPolicyDelegate):
(TestRunner::resetPageVisibility):
(TestRunner::setPageVisibility):
(TestRunner::grantWebNotificationPermission):
(TestRunner::denyWebNotificationPermission):
(TestRunner::removeAllWebNotificationPermissions):
(TestRunner::simulateWebNotificationClick):
(TestRunner::simulateLegacyWebNotificationClick):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177514 => 177515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-18 20:22:50 UTC (rev 177514)
+++ trunk/Tools/ChangeLog 2014-12-18 20:25:21 UTC (rev 177515)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2014-12-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Unreviewed gardening. Reorder file contents to match Mac version.
+
+ Reorder the contents of the TestRunnerWin so that it matches TestRunnerMac. This makes
+ it easier to see what steps are missing when running under Windows.
+
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::callShouldCloseOnWebView):
+ (TestRunner::clearAllApplicationCaches):
+ (TestRunner::applicationCacheDiskUsageForOrigin):
+ (TestRunner::syncLocalStorage):
+ (TestRunner::localStorageDiskUsageForOrigin):
+ (TestRunner::observeStorageTrackerNotifications):
+ (TestRunner::clearApplicationCacheForOrigin):
+ (TestRunner::originsWithApplicationCache):
+ (TestRunner::clearAllDatabases):
+ (TestRunner::deleteAllLocalStorage):
+ (TestRunner::setStorageDatabaseIdleInterval):
+ (TestRunner::closeIdleLocalStorageDatabases):
+ (TestRunner::originsWithLocalStorage):
+ (TestRunner::deleteLocalStorageForOrigin):
+ (TestRunner::numberOfPendingGeolocationPermissionRequests):
+ (jsStringRefToWString):
+ (TestRunner::setAppCacheMaximumSize):
+ (TestRunner::setDatabaseQuota):
+ (TestRunner::goBack):
+ (TestRunner::setDefersLoading):
+ (TestRunner::setDomainRelaxationForbiddenForURLScheme):
+ (TestRunner::setAutomaticLinkDetectionEnabled):
+ (TestRunner::dispatchPendingLoadRequests):
+ (TestRunner::overridePreference):
+ (TestRunner::removeAllVisitedLinks):
+ (TestRunner::waitForPolicyDelegate):
+ (TestRunner::resetPageVisibility):
+ (TestRunner::setPageVisibility):
+ (TestRunner::grantWebNotificationPermission):
+ (TestRunner::denyWebNotificationPermission):
+ (TestRunner::removeAllWebNotificationPermissions):
+ (TestRunner::simulateWebNotificationClick):
+ (TestRunner::simulateLegacyWebNotificationClick):
+
+2014-12-18 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Correct Windows tests after Bug 139149 (edit)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139781
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (177514 => 177515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-18 20:22:50 UTC (rev 177514)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-18 20:25:21 UTC (rev 177515)
</span><span class="lines">@@ -84,6 +84,102 @@
</span><span class="cx"> // FIXME: Implement!
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TestRunner::callShouldCloseOnWebView()
+{
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return false;
+
+ COMPtr<IWebViewPrivate> viewPrivate;
+ if (FAILED(webView->QueryInterface(&viewPrivate)))
+ return false;
+
+ BOOL result;
+ viewPrivate->shouldClose(&result);
+ return result;
+}
+
+void TestRunner::clearAllApplicationCaches()
+{
+ COMPtr<IWebApplicationCache> applicationCache;
+ if (FAILED(WebKitCreateInstance(CLSID_WebApplicationCache, 0, IID_IWebApplicationCache, reinterpret_cast<void**>(&applicationCache))))
+ return;
+
+ applicationCache->deleteAllApplicationCaches();
+}
+
+long long TestRunner::applicationCacheDiskUsageForOrigin(JSStringRef name)
+{
+ // FIXME: Implement to get disk usage by all application caches for an origin.
+ return 0;
+}
+
+void TestRunner::syncLocalStorage()
+{
+ // FIXME: Implement.
+}
+
+long long TestRunner::localStorageDiskUsageForOrigin(JSStringRef originIdentifier)
+{
+ // FIXME: Implement to support getting local storage disk usage for an origin.
+ return 0;
+}
+
+void TestRunner::observeStorageTrackerNotifications(unsigned number)
+{
+ // FIXME: Implement.
+}
+
+void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
+{
+ // FIXME: Implement to support deleting all application cache for an origin.
+}
+
+JSValueRef TestRunner::originsWithApplicationCache(JSContextRef context)
+{
+ // FIXME: Implement to get origins that have application caches.
+ return JSValueMakeUndefined(context);
+}
+
+
+void TestRunner::clearAllDatabases()
+{
+ COMPtr<IWebDatabaseManager> databaseManager;
+ COMPtr<IWebDatabaseManager> tmpDatabaseManager;
+ if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager)))
+ return;
+ if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager)))
+ return;
+
+ databaseManager->deleteAllDatabases();
+}
+
+void TestRunner::deleteAllLocalStorage()
+{
+ // FIXME: Implement.
+}
+
+void TestRunner::setStorageDatabaseIdleInterval(double)
+{
+ // FIXME: Implement this.
+}
+
+void TestRunner::closeIdleLocalStorageDatabases()
+{
+ // FIXME: Implement this.
+}
+
+JSValueRef TestRunner::originsWithLocalStorage(JSContextRef context)
+{
+ // FIXME: Implement.
+ return JSValueMakeUndefined(context);
+}
+
+void TestRunner::deleteLocalStorageForOrigin(JSStringRef URL)
+{
+ // FIXME: Implement.
+}
+
</ins><span class="cx"> void TestRunner::clearBackForwardList()
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebView> webView;
</span><span class="lines">@@ -110,21 +206,6 @@
</span><span class="cx"> backForwardList->goToItem(item.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool TestRunner::callShouldCloseOnWebView()
-{
- COMPtr<IWebView> webView;
- if (FAILED(frame->webView(&webView)))
- return false;
-
- COMPtr<IWebViewPrivate> viewPrivate;
- if (FAILED(webView->QueryInterface(&viewPrivate)))
- return false;
-
- BOOL result;
- viewPrivate->shouldClose(&result);
- return result;
-}
-
</del><span class="cx"> JSStringRef TestRunner::copyDecodedHostName(JSStringRef name)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement!
</span><span class="lines">@@ -137,11 +218,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::dispatchPendingLoadRequests()
-{
- // FIXME: Implement for testing fix for 6727495
-}
-
</del><span class="cx"> void TestRunner::display()
</span><span class="cx"> {
</span><span class="cx"> displayWebView();
</span><span class="lines">@@ -160,15 +236,10 @@
</span><span class="cx"> history->setOptionalSharedHistory(sharedHistory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::waitForPolicyDelegate()
</del><ins>+int TestRunner::numberOfPendingGeolocationPermissionRequests()
</ins><span class="cx"> {
</span><del>- COMPtr<IWebView> webView;
- if (FAILED(frame->webView(&webView)))
- return;
-
- setWaitToDump(true);
- policyDelegate->setControllerToNotifyDone(this);
- webView->setPolicyDelegate(policyDelegate);
</del><ins>+ // FIXME: Implement for Geolocation layout tests.
+ return -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t TestRunner::webHistoryItemCount()
</span><span class="lines">@@ -200,6 +271,16 @@
</span><span class="cx"> m_waitToDump = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static wstring jsStringRefToWString(JSStringRef jsStr)
+{
+ size_t length = JSStringGetLength(jsStr);
+ Vector<WCHAR> buffer(length + 1);
+ memcpy(buffer.data(), JSStringGetCharactersPtr(jsStr), length * sizeof(WCHAR));
+ buffer[length] = '\0';
+
+ return buffer.data();
+}
+
</ins><span class="cx"> JSStringRef TestRunner::pathToLocalResource(JSContextRef context, JSStringRef url)
</span><span class="cx"> {
</span><span class="cx"> wstring input(JSStringGetCharactersPtr(url), JSStringGetLength(url));
</span><span class="lines">@@ -213,16 +294,6 @@
</span><span class="cx"> return JSStringCreateWithCharacters(localPath.c_str(), localPath.length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static wstring jsStringRefToWString(JSStringRef jsStr)
-{
- size_t length = JSStringGetLength(jsStr);
- Vector<WCHAR> buffer(length + 1);
- memcpy(buffer.data(), JSStringGetCharactersPtr(jsStr), length * sizeof(WCHAR));
- buffer[length] = '\0';
-
- return buffer.data();
-}
-
</del><span class="cx"> void TestRunner::queueLoad(JSStringRef url, JSStringRef target)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebDataSource> dataSource;
</span><span class="lines">@@ -278,6 +349,11 @@
</span><span class="cx"> m_alwaysAcceptCookies = alwaysAcceptCookies;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::setAppCacheMaximumSize(unsigned long long size)
+{
+ printf("ERROR: TestRunner::setAppCacheMaximumSize() not implemented\n");
+}
+
</ins><span class="cx"> void TestRunner::setAuthorAndUserStylesEnabled(bool flag)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebView> webView;
</span><span class="lines">@@ -308,6 +384,40 @@
</span><span class="cx"> webView->setPolicyDelegate(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::setDatabaseQuota(unsigned long long quota)
+{
+ COMPtr<IWebDatabaseManager> databaseManager;
+ COMPtr<IWebDatabaseManager> tmpDatabaseManager;
+
+ if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager)))
+ return;
+ if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager)))
+ return;
+
+ databaseManager->setQuota(TEXT("file:///"), quota);
+}
+
+void TestRunner::goBack()
+{
+ // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+}
+
+void TestRunner::setDefersLoading(bool)
+{
+ // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+}
+
+void TestRunner::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
+{
+ COMPtr<IWebViewPrivate> webView;
+ if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
+ return;
+
+ BSTR schemeBSTR = JSStringCopyBSTR(scheme);
+ webView->setDomainRelaxationForbiddenForURLScheme(forbidden, schemeBSTR);
+ SysFreeString(schemeBSTR);
+}
+
</ins><span class="cx"> void TestRunner::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement for DeviceOrientation layout tests.
</span><span class="lines">@@ -332,12 +442,6 @@
</span><span class="cx"> setGeolocationPermissionCommon(allow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int TestRunner::numberOfPendingGeolocationPermissionRequests()
-{
- // FIXME: Implement for Geolocation layout tests.
- return -1;
-}
-
</del><span class="cx"> void TestRunner::setIconDatabaseEnabled(bool iconDatabaseEnabled)
</span><span class="cx"> {
</span><span class="cx"> // See also <rdar://problem/6480108>
</span><span class="lines">@@ -460,6 +564,11 @@
</span><span class="cx"> prefsPrivate->setJavaScriptCanAccessClipboard(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::setAutomaticLinkDetectionEnabled(bool)
+{
+ // FIXME: Implement this.
+}
+
</ins><span class="cx"> void TestRunner::setTabKeyCyclesThroughElements(bool shouldCycle)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebView> webView;
</span><span class="lines">@@ -669,6 +778,47 @@
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::dispatchPendingLoadRequests()
+{
+ // FIXME: Implement for testing fix for 6727495
+}
+
+void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
+{
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return;
+
+ COMPtr<IWebPreferences> preferences;
+ if (FAILED(webView->preferences(&preferences)))
+ return;
+
+ COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
+ if (!prefsPrivate)
+ return;
+
+ _bstr_t keyBSTR(JSStringCopyBSTR(key), false);
+ _bstr_t valueBSTR(JSStringCopyBSTR(value), false);
+ prefsPrivate->setPreferenceForTest(keyBSTR, valueBSTR);
+}
+
+void TestRunner::removeAllVisitedLinks()
+{
+ COMPtr<IWebHistory> history;
+ if (FAILED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(history), reinterpret_cast<void**>(&history))))
+ return;
+
+ COMPtr<IWebHistory> sharedHistory;
+ if (FAILED(history->optionalSharedHistory(&sharedHistory)) || !sharedHistory)
+ return;
+
+ COMPtr<IWebHistoryPrivate> sharedHistoryPrivate;
+ if (FAILED(sharedHistory->QueryInterface(&sharedHistoryPrivate)))
+ return;
+
+ sharedHistoryPrivate->removeAllVisitedLinks();
+}
+
</ins><span class="cx"> void TestRunner::setPersistentUserStyleSheetLocation(JSStringRef jsURL)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFStringRef> urlString = adoptCF(JSStringCopyCFString(0, jsURL));
</span><span class="lines">@@ -748,102 +898,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::clearAllApplicationCaches()
</del><ins>+void TestRunner::waitForPolicyDelegate()
</ins><span class="cx"> {
</span><del>- COMPtr<IWebApplicationCache> applicationCache;
- if (FAILED(WebKitCreateInstance(CLSID_WebApplicationCache, 0, IID_IWebApplicationCache, reinterpret_cast<void**>(&applicationCache))))
- return;
-
- applicationCache->deleteAllApplicationCaches();
-}
-
-void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
-{
- // FIXME: Implement to support deleting all application cache for an origin.
-}
-
-JSValueRef TestRunner::originsWithApplicationCache(JSContextRef context)
-{
- // FIXME: Implement to get origins that have application caches.
- return JSValueMakeUndefined(context);
-}
-
-long long TestRunner::applicationCacheDiskUsageForOrigin(JSStringRef name)
-{
- // FIXME: Implement to get disk usage by all application caches for an origin.
- return 0;
-}
-
-void TestRunner::clearAllDatabases()
-{
- COMPtr<IWebDatabaseManager> databaseManager;
- COMPtr<IWebDatabaseManager> tmpDatabaseManager;
- if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager)))
- return;
- if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager)))
- return;
-
- databaseManager->deleteAllDatabases();
-}
-
-void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
-{
</del><span class="cx"> COMPtr<IWebView> webView;
</span><span class="cx"> if (FAILED(frame->webView(&webView)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- COMPtr<IWebPreferences> preferences;
- if (FAILED(webView->preferences(&preferences)))
- return;
-
- COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
- if (!prefsPrivate)
- return;
-
- _bstr_t keyBSTR(JSStringCopyBSTR(key), false);
- _bstr_t valueBSTR(JSStringCopyBSTR(value), false);
- prefsPrivate->setPreferenceForTest(keyBSTR, valueBSTR);
</del><ins>+ setWaitToDump(true);
+ policyDelegate->setControllerToNotifyDone(this);
+ webView->setPolicyDelegate(policyDelegate);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::setDatabaseQuota(unsigned long long quota)
-{
- COMPtr<IWebDatabaseManager> databaseManager;
- COMPtr<IWebDatabaseManager> tmpDatabaseManager;
-
- if (FAILED(WebKitCreateInstance(CLSID_WebDatabaseManager, 0, IID_IWebDatabaseManager, (void**)&tmpDatabaseManager)))
- return;
- if (FAILED(tmpDatabaseManager->sharedWebDatabaseManager(&databaseManager)))
- return;
-
- databaseManager->setQuota(TEXT("file:///"), quota);
-}
-
-void TestRunner::goBack()
-{
- // FIXME: implement to enable loader/navigation-while-deferring-loads.html
-}
-
-void TestRunner::setDefersLoading(bool)
-{
- // FIXME: implement to enable loader/navigation-while-deferring-loads.html
-}
-
-void TestRunner::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
-{
- COMPtr<IWebViewPrivate> webView;
- if (FAILED(WebKitCreateInstance(__uuidof(WebView), 0, __uuidof(webView), reinterpret_cast<void**>(&webView))))
- return;
-
- BSTR schemeBSTR = JSStringCopyBSTR(scheme);
- webView->setDomainRelaxationForbiddenForURLScheme(forbidden, schemeBSTR);
- SysFreeString(schemeBSTR);
-}
-
-void TestRunner::setAppCacheMaximumSize(unsigned long long size)
-{
- printf("ERROR: TestRunner::setAppCacheMaximumSize() not implemented\n");
-}
-
</del><span class="cx"> static _bstr_t bstrT(JSStringRef jsString)
</span><span class="cx"> {
</span><span class="cx"> // The false parameter tells the _bstr_t constructor to adopt the BSTR we pass it.
</span><span class="lines">@@ -886,7 +951,6 @@
</span><span class="cx"> webView->addUserScriptToGroup(_bstr_t(L"org.webkit.DumpRenderTree").GetBSTR(), world.get(), bstrT(source).GetBSTR(), 0, 0, 0, 0, 0, runAtStart ? WebInjectAtDocumentStart : WebInjectAtDocumentEnd);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebViewPrivate> webView;
</span><span class="lines">@@ -1017,23 +1081,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::removeAllVisitedLinks()
-{
- COMPtr<IWebHistory> history;
- if (FAILED(WebKitCreateInstance(CLSID_WebHistory, 0, __uuidof(history), reinterpret_cast<void**>(&history))))
- return;
-
- COMPtr<IWebHistory> sharedHistory;
- if (FAILED(history->optionalSharedHistory(&sharedHistory)) || !sharedHistory)
- return;
-
- COMPtr<IWebHistoryPrivate> sharedHistoryPrivate;
- if (FAILED(sharedHistory->QueryInterface(&sharedHistoryPrivate)))
- return;
-
- sharedHistoryPrivate->removeAllVisitedLinks();
-}
-
</del><span class="cx"> void TestRunner::apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL)
</span><span class="cx"> {
</span><span class="cx">
</span><span class="lines">@@ -1074,38 +1121,6 @@
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::syncLocalStorage()
-{
- // FIXME: Implement.
-}
-
-void TestRunner::observeStorageTrackerNotifications(unsigned number)
-{
- // FIXME: Implement.
-}
-
-void TestRunner::deleteAllLocalStorage()
-{
- // FIXME: Implement.
-}
-
-JSValueRef TestRunner::originsWithLocalStorage(JSContextRef context)
-{
- // FIXME: Implement.
- return JSValueMakeUndefined(context);
-}
-
-long long TestRunner::localStorageDiskUsageForOrigin(JSStringRef originIdentifier)
-{
- // FIXME: Implement to support getting local storage disk usage for an origin.
- return 0;
-}
-
-void TestRunner::deleteLocalStorageForOrigin(JSStringRef URL)
-{
- // FIXME: Implement.
-}
-
</del><span class="cx"> void TestRunner::setTextDirection(JSStringRef direction)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebFramePrivate> framePrivate(Query, frame);
</span><span class="lines">@@ -1131,6 +1146,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::resetPageVisibility()
+{
+ // FIXME: Implement this.
+}
+
+void TestRunner::setPageVisibility(const char*)
+{
+ // FIXME: Implement this.
+}
+
</ins><span class="cx"> void TestRunner::grantWebNotificationPermission(JSStringRef origin)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1151,28 +1176,3 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement.
</span><span class="cx"> }
</span><del>-
-void TestRunner::resetPageVisibility()
-{
- // FIXME: Implement this.
-}
-
-void TestRunner::setPageVisibility(const char*)
-{
- // FIXME: Implement this.
-}
-
-void TestRunner::setAutomaticLinkDetectionEnabled(bool)
-{
- // FIXME: Implement this.
-}
-
-void TestRunner::setStorageDatabaseIdleInterval(double)
-{
- // FIXME: Implement this.
-}
-
-void TestRunner::closeIdleLocalStorageDatabases()
-{
- // FIXME: Implement this.
-}
</del></span></pre>
</div>
</div>
</body>
</html>