WebKit side of merge from r41149 to r41181.

WebCore/dom/WorkerRunLoop.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 80 matching lines @@
         : m_mode(mode)
         , m_defaultMode(mode == WorkerRunLoop::defaultMode())
     {
     }
 
     bool isDefaultMode() const
     {
         return m_defaultMode;
     }
 
-    bool operator()(PassRefPtr<WorkerRunLoop::Task> task)
+    bool operator()(PassRefPtr<WorkerRunLoop::Task> task) const
     {
         return m_defaultMode || m_mode == task->mode();
     }
 
 private:
     String m_mode;
     bool m_defaultMode;
 };
 
 WorkerRunLoop::WorkerRunLoop()
@@ skipping 44 matching lines @@
 }
 
 MessageQueueWaitResult WorkerRunLoop::runInMode(WorkerContext* context, const String& mode)
 {
     RunLoopSetup setup(*this);
     ModePredicate modePredicate(mode);
     MessageQueueWaitResult result = runInMode(context, modePredicate);
     return result;
 }
 
-MessageQueueWaitResult WorkerRunLoop::runInMode(WorkerContext* context, ModePredicate& predicate)
+MessageQueueWaitResult WorkerRunLoop::runInMode(WorkerContext* context, const ModePredicate& predicate)
 {
     ASSERT(context);
     ASSERT(context->thread());
     ASSERT(context->thread()->threadID() == currentThread());
 
+    double absoluteTime = (predicate.isDefaultMode() && m_sharedTimer->isActive()) ? m_sharedTimer->fireTime() : MessageQueue<RefPtr<Task> >::infiniteTime();
     RefPtr<Task> task;
-    MessageQueueWaitResult result;
-    if (predicate.isDefaultMode()) {
-        if (m_sharedTimer->isActive())
-            result = m_messageQueue.waitForMessageTimed(task, m_sharedTimer->fireTime());
-        else
-            result = m_messageQueue.waitForMessage(task) ? MessageQueueMessageReceived : MessageQueueTerminated;
-    } else
-        result = m_messageQueue.waitForMessageFiltered(task, predicate);
+    MessageQueueWaitResult result = m_messageQueue.waitForMessageFilteredWithTimeout(task, predicate, absoluteTime);
 
     switch (result) {
     case MessageQueueTerminated:
         break;
 
     case MessageQueueMessageReceived:
         task->performTask(context);
         break;
 
     case MessageQueueTimeout:
@@ skipping 15 matching lines @@
 }
 
 void WorkerRunLoop::postTaskForMode(PassRefPtr<ScriptExecutionContext::Task> task, const String& mode)
 {
     m_messageQueue.append(Task::create(task, mode.copy()));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)