Changeset 47248 in webkit

Timestamp:

Aug 13, 2009 3:55:51 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-13 Drew Wilson <​atwilson@google.com>

Reviewed by David Levin.

Merge error in SharedWorker code
​https://bugs.webkit.org/show_bug.cgi?id=28277

Fixed merge error that prevents WebKit from compiling with SHARED_WORKERS enabled.
No new tests needed.

• workers/DefaultSharedWorkerRepository.cpp: Removed duplicated functions.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/DefaultSharedWorkerRepository.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-13  Drew Wilson  <atwilson@google.com>
+
+        Reviewed by David Levin.
+
+        Merge error in SharedWorker code
+        https://bugs.webkit.org/show_bug.cgi?id=28277
+
+        Fixed merge error that prevents WebKit from compiling with SHARED_WORKERS enabled.
+        No new tests needed.
+
+        * workers/DefaultSharedWorkerRepository.cpp:
+        Removed duplicated functions.
+
 2009-08-13  Kyle Prete  <kylep@chromium.org>
 

trunk/WebCore/workers/DefaultSharedWorkerRepository.cpp

@@ -126 +126 @@
 void SharedWorkerProxy::workerContextDestroyed()
 {
-    // FIXME: Remove the proxy from the repository once the worker context is destroyed.
-    notImplemented();
+    // The proxy may be freed by this call, so do not reference it any further.
+    DefaultSharedWorkerRepository::instance().removeProxy(this);
 }
 
@@ -156 +156 @@
     if (m_thread)
         m_thread->stop();
-}
-
-void SharedWorkerProxy::postExceptionToWorkerObject(const String&, int, const String&)
-{
-    // FIXME: Log exceptions to all parent documents.
-    notImplemented();
-}
-
-void SharedWorkerProxy::postConsoleMessageToWorkerObject(MessageDestination, MessageSource, MessageType, MessageLevel, const String&, int, const String&)
-{
-    // FIXME: Log console messages to all parent documents.
-    notImplemented();
-}
-
-// When close() is invoked, mark the proxy as closing so we don't share it with any new requests.
-void SharedWorkerProxy::workerContextClosed()
-{
-    m_closing = true;
-}
-
-void SharedWorkerProxy::workerContextDestroyed()
-{
-    // The proxy may be freed by this call, so do not reference it any further.
-    DefaultSharedWorkerRepository::instance().removeProxy(this);
 }