<!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>[174796] 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/174796">174796</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 15:08:12 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Update DRT to match Mac Logic
https://bugs.webkit.org/show_bug.cgi?id=137787
Reviewed by Dean Jackson.
* DumpRenderTree/win/DumpRenderTree.cpp:
(initialize): 0 -> nullptr
(runTest): Initialize MSG structure before using.
(main): Add CRT debug flags if building DRT with debug malloc on Windows.
Also, cleanly shut down COM when exiting.
* DumpRenderTree/win/FrameLoadDelegate.cpp:
(FrameLoadDelegate::didChangeLocationWithinPageForFrame): Move from
header and add printf to match Mac.
(FrameLoadDelegate::windowScriptObjectAvailable): Ditto.
* DumpRenderTree/win/FrameLoadDelegate.h:
(FrameLoadDelegate::didChangeLocationWithinPageForFrame): Deleted.
(FrameLoadDelegate::windowScriptObjectAvailable): Deleted.
* DumpRenderTree/win/ResourceLoadDelegate.cpp:
(isLocalhost): Added.
(hostIsUsedBySomeTestsToGenerateError): Added.
(ResourceLoadDelegate::willSendRequest): Add logic to mimic Mac's use
of certain error and redirect host names.
* DumpRenderTree/win/UIDelegate.cpp:
(UIDelegate::runJavaScriptAlertPanelWithMessage): Use 'done' flag to decide if
anything should be output to the console. This modifies behavior to match the Mac.
(UIDelegate::runJavaScriptConfirmPanelWithMessage): Ditto.
(UIDelegate::runJavaScriptTextInputPanelWithPrompt): Ditto.
(UIDelegate::runBeforeUnloadConfirmPanelWithMessage): Ditto.
(UIDelegate::webViewAddMessageToConsole): Ditto.
* WinLauncher/PageLoadTestClient.cpp:
(PageLoadTestClient::pageLoadEndedAtTime): Drive-by-fix for an assertion that I
added last week.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinFrameLoadDelegatecpp">trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinFrameLoadDelegateh">trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreewinResourceLoadDelegatecpp">trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinUIDelegatecpp">trunk/Tools/DumpRenderTree/win/UIDelegate.cpp</a></li>
<li><a href="#trunkToolsWinLauncherPageLoadTestClientcpp">trunk/Tools/WinLauncher/PageLoadTestClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/ChangeLog 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-10-16 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update DRT to match Mac Logic
+ https://bugs.webkit.org/show_bug.cgi?id=137787
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (initialize): 0 -> nullptr
+ (runTest): Initialize MSG structure before using.
+ (main): Add CRT debug flags if building DRT with debug malloc on Windows.
+ Also, cleanly shut down COM when exiting.
+ * DumpRenderTree/win/FrameLoadDelegate.cpp:
+ (FrameLoadDelegate::didChangeLocationWithinPageForFrame): Move from
+ header and add printf to match Mac.
+ (FrameLoadDelegate::windowScriptObjectAvailable): Ditto.
+ * DumpRenderTree/win/FrameLoadDelegate.h:
+ (FrameLoadDelegate::didChangeLocationWithinPageForFrame): Deleted.
+ (FrameLoadDelegate::windowScriptObjectAvailable): Deleted.
+ * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+ (isLocalhost): Added.
+ (hostIsUsedBySomeTestsToGenerateError): Added.
+ (ResourceLoadDelegate::willSendRequest): Add logic to mimic Mac's use
+ of certain error and redirect host names.
+ * DumpRenderTree/win/UIDelegate.cpp:
+ (UIDelegate::runJavaScriptAlertPanelWithMessage): Use 'done' flag to decide if
+ anything should be output to the console. This modifies behavior to match the Mac.
+ (UIDelegate::runJavaScriptConfirmPanelWithMessage): Ditto.
+ (UIDelegate::runJavaScriptTextInputPanelWithPrompt): Ditto.
+ (UIDelegate::runBeforeUnloadConfirmPanelWithMessage): Ditto.
+ (UIDelegate::webViewAddMessageToConsole): Ditto.
+ * WinLauncher/PageLoadTestClient.cpp:
+ (PageLoadTestClient::pageLoadEndedAtTime): Drive-by-fix for an assertion that I
+ added last week.
+
</ins><span class="cx"> 2014-10-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r174754.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> dllRegisterServer();
</span><span class="cx">
</span><span class="cx"> // Init COM
</span><del>- OleInitialize(0);
</del><ins>+ OleInitialize(nullptr);
</ins><span class="cx">
</span><span class="cx"> static LPCTSTR fontsToInstall[] = {
</span><span class="cx"> TEXT("AHEM____.ttf"),
</span><span class="lines">@@ -1064,6 +1064,7 @@
</span><span class="cx"> WorkQueue::shared()->clear();
</span><span class="cx"> WorkQueue::shared()->setFrozen(false);
</span><span class="cx">
</span><ins>+ MSG msg = { 0 };
</ins><span class="cx"> HWND hostWindow;
</span><span class="cx"> webView->hostWindow(&hostWindow);
</span><span class="cx">
</span><span class="lines">@@ -1077,7 +1078,6 @@
</span><span class="cx"> request->setHTTPMethod(methodBStr);
</span><span class="cx"> frame->loadRequest(request.get());
</span><span class="cx">
</span><del>- MSG msg;
</del><span class="cx"> while (true) {
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
</span><span class="lines">@@ -1241,6 +1241,11 @@
</span><span class="cx">
</span><span class="cx"> int main(int argc, const char* argv[])
</span><span class="cx"> {
</span><ins>+#ifdef _CRTDBG_MAP_ALLOC
+ _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+#endif
+
</ins><span class="cx"> // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
</span><span class="cx"> // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
</span><span class="cx"> // error mode here to work around Cygwin's behavior. See <http://webkit.org/b/55222>.
</span><span class="lines">@@ -1399,7 +1404,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> shutDownWebKit();
</span><ins>+#ifdef _CRTDBG_MAP_ALLOC
+ _CrtDumpMemoryLeaks();
+#endif
</ins><span class="cx">
</span><ins>+ ::OleUninitialize();
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinFrameLoadDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -139,6 +139,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HRESULT FrameLoadDelegate::didChangeLocationWithinPageForFrame(IWebView* , IWebFrame* frame)
+{
+ if (!done && gTestRunner->dumpFrameLoadCallbacks())
+ printf("%s - didChangeLocationWithinPageForFrame\n", descriptionSuitableForTestResult(frame).c_str());
+
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT FrameLoadDelegate::didFailProvisionalLoadWithError(IWebView* /*webView*/, IWebError* error, IWebFrame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!done && gTestRunner->dumpFrameLoadCallbacks())
</span><span class="lines">@@ -282,6 +290,16 @@
</span><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HRESULT FrameLoadDelegate::windowScriptObjectAvailable(IWebView*, JSContextRef, JSObjectRef)
+{
+ if (!done && gTestRunner->dumpFrameLoadCallbacks())
+ printf("?? - windowScriptObjectAvailable\n");
+
+ ASSERT_NOT_REACHED();
+
+ return S_OK;
+}
+
</ins><span class="cx"> HRESULT FrameLoadDelegate::didClearWindowObject(IWebView*, JSContextRef, JSObjectRef, IWebFrame*)
</span><span class="cx"> {
</span><span class="cx"> return E_NOTIMPL;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/DumpRenderTree/win/FrameLoadDelegate.h 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -89,9 +89,7 @@
</span><span class="cx"> /* [in] */ IWebError *error,
</span><span class="cx"> /* [in] */ IWebFrame *forFrame);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(
- /* [in] */ IWebView *webView,
- /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(IWebView*, IWebFrame*);
</ins><span class="cx">
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE willPerformClientRedirectToURL(
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="lines">@@ -108,16 +106,10 @@
</span><span class="cx"> /* [in] */ IWebView *webView,
</span><span class="cx"> /* [in] */ IWebFrame *frame);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable(
- /* [in] */ IWebView *sender,
- /* [in] */ JSContextRef context,
- /* [in] */ JSObjectRef windowObject) { return E_NOTIMPL; }
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE windowScriptObjectAvailable(IWebView*,
+JSContextRef, JSObjectRef windowObject);
</ins><span class="cx">
</span><del>- virtual /* [local] */ HRESULT STDMETHODCALLTYPE didClearWindowObject(
- /* [in] */ IWebView* webView,
- /* [in] */ JSContextRef context,
- /* [in] */ JSObjectRef windowObject,
- /* [in] */ IWebFrame* frame);
</del><ins>+ virtual /* [local] */ HRESULT STDMETHODCALLTYPE didClearWindowObject(IWebView*, JSContextRef, JSObjectRef windowObject, IWebFrame*);
</ins><span class="cx">
</span><span class="cx"> // IWebFrameLoadDelegatePrivate
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE didFinishDocumentLoadForFrame(
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinResourceLoadDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <comutil.h>
</span><span class="cx"> #include <sstream>
</span><span class="cx"> #include <tchar.h>
</span><ins>+#include <wtf/RetainPtr.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="lines">@@ -217,6 +218,17 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isLocalhost(CFStringRef host)
+{
+ return kCFCompareEqualTo == CFStringCompare(host, CFSTR("127.0.0.1"), 0)
+ || kCFCompareEqualTo == CFStringCompare(host, CFSTR("localhost"), 0);
+}
+
+static bool hostIsUsedBySomeTestsToGenerateError(CFStringRef host)
+{
+ return kCFCompareEqualTo == CFStringCompare(host, CFSTR("255.255.255.255"), 0);
+}
+
</ins><span class="cx"> HRESULT ResourceLoadDelegate::willSendRequest(IWebView* webView, unsigned long identifier, IWebURLRequest* request,
</span><span class="cx"> IWebURLResponse* redirectResponse, IWebDataSource* dataSource, IWebURLRequest** newRequest)
</span><span class="cx"> {
</span><span class="lines">@@ -229,22 +241,56 @@
</span><span class="cx">
</span><span class="cx"> if (!done && !gTestRunner->deferMainResourceDataLoad()) {
</span><span class="cx"> COMPtr<IWebDataSourcePrivate> dataSourcePrivate(Query, dataSource);
</span><del>- if (!dataSourcePrivate)
</del><ins>+ if (!dataSourcePrivate) {
+ *newRequest = nullptr;
</ins><span class="cx"> return E_FAIL;
</span><ins>+ }
</ins><span class="cx"> dataSourcePrivate->setDeferMainResourceDataLoad(FALSE);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!done && gTestRunner->willSendRequestReturnsNull()) {
</span><del>- *newRequest = 0;
</del><ins>+ *newRequest = nullptr;
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!done && gTestRunner->willSendRequestReturnsNullOnRedirect() && redirectResponse) {
</span><span class="cx"> printf("Returning null for this redirect\n");
</span><del>- *newRequest = 0;
</del><ins>+ *newRequest = nullptr;
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _bstr_t urlBstr;
+ if (FAILED(request->URL(&urlBstr.GetBSTR()))) {
+ printf("Request has no URL\n");
+ *newRequest = nullptr;
+ return E_FAIL;
+ }
+
+ RetainPtr<CFStringRef> str = adoptCF(CFStringCreateWithCString(0, static_cast<const char*>(urlBstr), kCFStringEncodingWindowsLatin1));
+ RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithString(kCFAllocatorDefault, str.get(), nullptr));
+ if (url) {
+ RetainPtr<CFStringRef> host = adoptCF(CFURLCopyHostName(url.get()));
+ RetainPtr<CFStringRef> scheme = adoptCF(CFURLCopyScheme(url.get()));
+
+ if (host && ((kCFCompareEqualTo == CFStringCompare(scheme.get(), CFSTR("http"), kCFCompareCaseInsensitive))
+ || (kCFCompareEqualTo == CFStringCompare(scheme.get(), CFSTR("https"), kCFCompareCaseInsensitive)))) {
+ RetainPtr<CFStringRef> testPathOrURL = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, gTestRunner->testPathOrURL().c_str(), kCFStringEncodingWindowsLatin1));
+ RetainPtr<CFMutableStringRef> lowercaseTestPathOrURL = adoptCF(CFStringCreateMutableCopy(kCFAllocatorDefault, CFStringGetLength(testPathOrURL.get()), testPathOrURL.get()));
+ RetainPtr<CFLocaleRef> locale = CFLocaleCopyCurrent();
+ CFStringLowercase(lowercaseTestPathOrURL.get(), locale.get());
+ RetainPtr<CFStringRef> testHost;
+ if (CFStringHasPrefix(lowercaseTestPathOrURL.get(), CFSTR("http:")) || CFStringHasPrefix(lowercaseTestPathOrURL.get(), CFSTR("https:"))) {
+ RetainPtr<CFURLRef> testPathURL = adoptCF(CFURLCreateWithString(kCFAllocatorDefault, lowercaseTestPathOrURL.get(), nullptr));
+ testHost = adoptCF(CFURLCopyHostName(testPathURL.get()));
+ }
+ if (!isLocalhost(host.get()) && !hostIsUsedBySomeTestsToGenerateError(host.get()) && (!testHost || isLocalhost(testHost.get()))) {
+ printf("Blocked access to external URL %s\n", static_cast<const char*>(urlBstr));
+ *newRequest = nullptr;
+ return S_OK;
+ }
+ }
+ }
+
</ins><span class="cx"> IWebMutableURLRequest* requestCopy = 0;
</span><span class="cx"> request->mutableCopy(&requestCopy);
</span><span class="cx"> const set<string>& clearHeaders = gTestRunner->willSendRequestClearHeaders();
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinUIDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/UIDelegate.cpp (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -367,15 +367,19 @@
</span><span class="cx">
</span><span class="cx"> HRESULT UIDelegate::runJavaScriptAlertPanelWithMessage(IWebView* /*sender*/, BSTR message)
</span><span class="cx"> {
</span><del>- printf("ALERT: %S\n", message ? message : L"");
- fflush(stdout);
</del><ins>+ if (!done) {
+ printf("ALERT: %S\n", message ? message : L"");
+ fflush(stdout);
+ }
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT UIDelegate::runJavaScriptConfirmPanelWithMessage(IWebView* /*sender*/, BSTR message, BOOL* result)
</span><span class="cx"> {
</span><del>- printf("CONFIRM: %S\n", message ? message : L"");
</del><ins>+ if (!done)
+ printf("CONFIRM: %S\n", message ? message : L"");
+
</ins><span class="cx"> *result = TRUE;
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -383,7 +387,9 @@
</span><span class="cx">
</span><span class="cx"> HRESULT UIDelegate::runJavaScriptTextInputPanelWithPrompt(IWebView* /*sender*/, BSTR message, BSTR defaultText, BSTR* result)
</span><span class="cx"> {
</span><del>- printf("PROMPT: %S, default text: %S\n", message ? message : L"", defaultText ? defaultText : L"");
</del><ins>+ if (!done)
+ printf("PROMPT: %S, default text: %S\n", message ? message : L"", defaultText ? defaultText : L"");
+
</ins><span class="cx"> *result = SysAllocString(defaultText);
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -393,13 +399,20 @@
</span><span class="cx"> {
</span><span class="cx"> if (!result)
</span><span class="cx"> return E_POINTER;
</span><del>- printf("CONFIRM NAVIGATION: %S\n", message ? message : L"");
</del><ins>+
+ if (!done)
+ printf("CONFIRM NAVIGATION: %S\n", message ? message : L"");
+
</ins><span class="cx"> *result = !gTestRunner->shouldStayOnPageAfterHandlingBeforeUnload();
</span><ins>+
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT UIDelegate::webViewAddMessageToConsole(IWebView* /*sender*/, BSTR message, int lineNumber, BSTR url, BOOL isError)
</span><span class="cx"> {
</span><ins>+ if (done)
+ return S_OK;
+
</ins><span class="cx"> wstring newMessage;
</span><span class="cx"> if (message) {
</span><span class="cx"> newMessage = message;
</span></span></pre></div>
<a id="trunkToolsWinLauncherPageLoadTestClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/PageLoadTestClient.cpp (174795 => 174796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/PageLoadTestClient.cpp 2014-10-16 22:02:16 UTC (rev 174795)
+++ trunk/Tools/WinLauncher/PageLoadTestClient.cpp 2014-10-16 22:08:12 UTC (rev 174796)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> void PageLoadTestClient::pageLoadEndedAtTime(CFAbsoluteTime endTime)
</span><span class="cx"> {
</span><del>- ASSERT(m_endTimes.size() == m_currentRepetition);
</del><ins>+ ASSERT(!m_pageLoadTesting || m_endTimes.size() == m_currentRepetition);
</ins><span class="cx"> m_endTimes.append(endTime);
</span><span class="cx">
</span><span class="cx"> if (m_currentRepetition) {
</span></span></pre>
</div>
</div>
</body>
</html>