WebKit side of merge from r41149 to r41181.

JavaScriptCore/wtf/ThreadingQt.cpp

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 224 matching lines @@
 }
 
 bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
 {
     double currentTime = WTF::currentTime();
 
     // Time is in the past - return immediately.
     if (absoluteTime < currentTime)
         return false;
 
+    // Time is too far in the future (and would overflow unsigned long) - wait forever.
+    if (absoluteTime - currentTime > static_cast<double>(INT_MAX) / 1000.0) {
+        wait(mutex);
+        return true;
+    }
+
     double intervalMilliseconds = (absoluteTime - currentTime) * 1000.0;
-    // Qt defines wait for up to ULONG_MAX milliseconds.
-    if (intervalMilliseconds >= ULONG_MAX)
-        intervalMilliseconds = ULONG_MAX;
-
     return m_condition->wait(mutex.impl(), static_cast<unsigned long>(intervalMilliseconds));
 }
 
 void ThreadCondition::signal()
 {
     m_condition->wakeOne();
 }
 
 void ThreadCondition::broadcast()
 {
     m_condition->wakeAll();
 }
 
 } // namespace WebCore