Commit 049517f5 authored by aroben@apple.com's avatar aroben@apple.com
Browse files

Remove DRT/win's hang timer

        run-webkit-tests takes care of this for us now

        Reviewed by Anders Carlsson.

        * DumpRenderTree/win/DumpRenderTree.cpp:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32036 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b208f11b
2008-04-17 Adam Roben <aroben@apple.com>
Remove DRT/win's hang timer
run-webkit-tests takes care of this for us now
Reviewed by Anders Carlsson.
* DumpRenderTree/win/DumpRenderTree.cpp:
2008-04-17 Adam Roben <aroben@apple.com>
 
Don't wait for the hang timer twice in the case of a hang
......
......@@ -72,7 +72,6 @@ static bool dumpPixels;
static bool dumpAllPixels;
static bool printSeparators;
static bool leakChecking = false;
static bool timedOut = false;
static bool threaded = false;
static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
......@@ -97,9 +96,6 @@ HWND webViewWindow;
LayoutTestController* layoutTestController = 0;
CFRunLoopTimerRef waitToDumpWatchdog = 0;
static const unsigned timeoutValue = 60000;
static const unsigned timeoutId = 10;
const unsigned maxViewWidth = 800;
const unsigned maxViewHeight = 600;
......@@ -119,12 +115,6 @@ wstring urlSuitableForTestResult(const wstring& url)
static LRESULT CALLBACK DumpRenderTreeWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
case WM_TIMER:
// The test ran long enough to time out
timedOut = true;
PostQuitMessage(0);
return 0;
break;
case WM_DESTROY:
for (unsigned i = openWindows().size() - 1; i >= 0; --i) {
if (openWindows()[i] == hWnd) {
......@@ -694,7 +684,6 @@ static void runTest(const char* pathOrURL)
::layoutTestController = new LayoutTestController(false, false);
done = false;
topLoadingFrame = 0;
timedOut = false;
if (shouldLogFrameLoadDelegates(pathOrURL))
layoutTestController->setDumpFrameLoadCallbacks(true);
......@@ -720,9 +709,6 @@ static void runTest(const char* pathOrURL)
HWND hostWindow;
webView->hostWindow(reinterpret_cast<OLE_HANDLE*>(&hostWindow));
// Set the test timeout timer
SetTimer(hostWindow, timeoutId, timeoutValue, 0);
COMPtr<IWebMutableURLRequest> request;
HRESULT hr = CoCreateInstance(CLSID_WebMutableURLRequest, 0, CLSCTX_ALL, IID_IWebMutableURLRequest, (void**)&request);
if (FAILED(hr))
......@@ -743,15 +729,6 @@ static void runTest(const char* pathOrURL)
TranslateMessage(&msg);
DispatchMessage(&msg);
}
KillTimer(hostWindow, timeoutId);
if (timedOut) {
fprintf(stderr, "ERROR: Timed out running %s\n", pathOrURL);
printf("ERROR: Timed out loading page\n");
if (printSeparators)
puts("#EOF");
}
frame->stopLoading();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment