WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/dom/Worker.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 76 matching lines @@
     return static_cast<Document*>(scriptExecutionContext());
 }
 
 void Worker::postMessage(const String& message)
 {
     m_messagingProxy->postMessageToWorkerContext(message);
 }
 
 void Worker::terminate()
 {
-    m_messagingProxy->terminate();
+    m_messagingProxy->terminateWorkerContext();
 }
 
 bool Worker::canSuspend() const
 {
     // FIXME: It is not currently possible to suspend a worker, so pages with workers can not go into page cache.
     return false;
 }
 
 void Worker::stop()
 {
     terminate();
 }
 
 bool Worker::hasPendingActivity() const
 {
-    return m_messagingProxy->workerThreadHasPendingActivity() || ActiveDOMObject::hasPendingActivity();
+    return m_messagingProxy->hasPendingActivity() || ActiveDOMObject::hasPendingActivity();
 }
 
 void Worker::notifyFinished(CachedResource* unusedResource)
 {
     ASSERT_UNUSED(unusedResource, unusedResource == m_cachedScript);
 
     if (m_cachedScript->errorOccurred())
         dispatchErrorEvent();
     else {
         String userAgent = document()->frame() ? document()->frame()->loader()->userAgent(m_scriptURL) : String();
@@ skipping 71 matching lines @@
     }
 
     return !event->defaultPrevented();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)