WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/dom/WorkerContext.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 90 matching lines @@
     ActiveDOMObjectsMap::const_iterator activeObjectsEnd = activeObjects.end();
     for (ActiveDOMObjectsMap::const_iterator iter = activeObjects.begin(); iter != activeObjectsEnd; ++iter) {
         if (iter->first->hasPendingActivity())
             return true;
     }
     return false;
 }
 
 void WorkerContext::reportException(const String& errorMessage, int lineNumber, const String& sourceURL)
 {
-    m_thread->messagingProxy()->postWorkerException(errorMessage, lineNumber, sourceURL);
+    m_thread->messagingProxy()->postExceptionToWorkerObject(errorMessage, lineNumber, sourceURL);
 }
 
 static void addMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
 {
     if (messagingProxy->askedToTerminate())
         return;
     context->addMessage(destination, source, level, message, lineNumber, sourceURL);
 }
 
 void WorkerContext::addMessage(MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
@@ skipping 82 matching lines @@
 {
     DOMTimer::removeById(scriptExecutionContext(), timeoutId);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)