Merge 175566 "Suspend setTimeout callbacks while dedicated worke..."

Source/core/workers/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 161 matching lines @@
     RunLoopSetup setup(*this, m_context);
     return run(m_debuggerMessageQueue, waitMode);
 }
 
 MessageQueueWaitResult WorkerRunLoop::run(MessageQueue<blink::WebThread::Task>& queue, WaitMode waitMode)
 {
     ASSERT(m_context);
     ASSERT(m_context->thread());
     ASSERT(m_context->thread()->isCurrentThread());
 
+    bool isDebuggerQueue = (&queue == &m_debuggerMessageQueue);
     bool nextTimeoutEventIsIdleWatchdog;
     MessageQueueWaitResult result;
     OwnPtr<blink::WebThread::Task> task;
     do {
         double absoluteTime = 0.0;
         nextTimeoutEventIsIdleWatchdog = false;
         if (waitMode == WaitForMessage) {
-            absoluteTime = m_sharedTimer->isActive() ? m_sharedTimer->fireTime() : MessageQueue<blink::WebThread::Task>::infiniteTime();
+            absoluteTime = !isDebuggerQueue && m_sharedTimer->isActive() ? m_sharedTimer->fireTime() : MessageQueue<blink::WebThread::Task>::infiniteTime();
 
             // Do a script engine idle notification if the next event is distant enough.
             const double kMinIdleTimespan = 0.3; // seconds
             if (queue.isEmpty() && absoluteTime > currentTime() + kMinIdleTimespan) {
                 bool hasMoreWork = !m_context->idleNotification();
                 if (hasMoreWork) {
                     // Schedule a watchdog, so if there are no events within a particular time interval
                     // idle notifications won't stop firing.
                     const double kWatchdogInterval = 3; // seconds
                     double nextWatchdogTime = currentTime() + kWatchdogInterval;
@@ skipping 18 matching lines @@
     case MessageQueueTerminated:
         break;
 
     case MessageQueueMessageReceived:
         InspectorInstrumentation::willProcessTask(m_context);
         task->run();
         InspectorInstrumentation::didProcessTask(m_context);
         break;
 
     case MessageQueueTimeout:
+        ASSERT(!isDebuggerQueue || waitMode != WaitForMessage);
         if (!m_context->isClosing())
             m_sharedTimer->fire();
         break;
     }
 
     return result;
 }
 
 void WorkerRunLoop::runCleanupTasks()
 {
@@ skipping 32 matching lines @@
 
 bool WorkerRunLoop::postDebuggerTask(PassOwnPtr<ExecutionContextTask> task)
 {
     bool posted = m_debuggerMessageQueue.append(WorkerRunLoopTask::create(*this, task));
     if (posted)
         postTask(TickleDebuggerQueueTask::create(this));
     return posted;
 }
 
 } // namespace WebCore