[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mjs at apple.com
mjs at apple.com
Fri Jan 21 15:16:21 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 73b728835f92bf8d19cc0e1009d66de02d22b689
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 10 20:00:42 2011 +0000
2011-01-10 Maciej Stachowiak <mjs at apple.com>
Reviewed by Anders Carlsson.
WebKitTestRunner uses crazy amounts of CPU, making layout tests slow and flaky
https://bugs.webkit.org/show_bug.cgi?id=52160
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformRunUntil): Instead of busy-looping, wait for the timeout.
Anything that can make runUntil() conditions turn true will happen on a run loop cycle
anyway.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 36eff69..874e892 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ WebKitTestRunner uses crazy amounts of CPU, making layout tests slow and flaky
+ https://bugs.webkit.org/show_bug.cgi?id=52160
+
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformRunUntil): Instead of busy-looping, wait for the timeout.
+ Anything that can make runUntil() conditions turn true will happen on a run loop cycle
+ anyway.
+
2011-01-10 Tony Chang <tony at chromium.org>
Reviewed by Mihai Parparita.
diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
index fee0070..6a4444f 100644
--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
@@ -52,8 +52,10 @@ void TestController::initializeTestPluginDirectory()
void TestController::platformRunUntil(bool& done, double timeout)
{
CFAbsoluteTime end = CFAbsoluteTimeGetCurrent() + timeout;
+ CFDateRef endDate = CFDateCreate(0, end);
while (!done && CFAbsoluteTimeGetCurrent() < end)
- [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:(NSDate *)endDate];
+ CFRelease(endDate);
}
void TestController::platformInitializeContext()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list