Skip to content

Instantly share code, notes, and snippets.

@BenjaminPoulain
Created May 29, 2012 19:34
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save BenjaminPoulain/2830213 to your computer and use it in GitHub Desktop.
Save BenjaminPoulain/2830213 to your computer and use it in GitHub Desktop.
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 895629c..4494778 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-05-29 Benjamin Poulain <bpoulain@apple.com>
+
+ Fix the type of dispatch_time() offset
+
+ Rubber-stamped by Joseph Pecoraro.
+
+ In r118631, I erroneously used the type NSTimeInterval for the delta of dispatch_time().
+
+ * DumpRenderTree/mac/FrameLoadDelegate.mm:
+ (-[FrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
+
2012-05-29 Arvid Nilsson <anilsson@rim.com>
2012-05-29 Arvid Nilsson <anilsson@rim.com>
diff --git a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
index c9c3fb5..69c2461 100644
--- a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
+++ b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
@@ -180,7 +180,7 @@
if (!done && gLayoutTestController->useDeferredFrameLoading()) {
[sender setDefersCallbacks:YES];
- NSTimeInterval deferredWaitTime = 5 * NSEC_PER_MSEC;
+ int64_t deferredWaitTime = 5 * NSEC_PER_MSEC;
dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, deferredWaitTime);
dispatch_after(when, dispatch_get_main_queue(), ^{
[sender setDefersCallbacks:NO];
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment