Merge WebKit r47420

1 files changed, 4 insertions, 11 deletions

diff --git a/WebCore/workers/WorkerObjectProxy.h b/WebCore/workers/WorkerObjectProxy.h
index c5f4456..586e7a0 100644
--- a/WebCore/workers/WorkerObjectProxy.h
+++ b/WebCore/workers/WorkerObjectProxy.h
@@ -33,31 +33,24 @@
 
 #if ENABLE(WORKERS)
 
-#include "Console.h"
+#include "WorkerReportingProxy.h"
 
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
     class MessagePortChannel;
-    class String;
 
     // A proxy to talk to the worker object.
-    class WorkerObjectProxy {
+    class WorkerObjectProxy : public WorkerReportingProxy {
     public:
-        virtual ~WorkerObjectProxy() {}
-
         virtual void postMessageToWorkerObject(const String&, PassOwnPtr<MessagePortChannel>) = 0;
 
-        virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL) = 0;
-
-        virtual void postConsoleMessageToWorkerObject(MessageDestination, MessageSource, MessageType, MessageLevel, const String& message, int lineNumber, const String& sourceURL) = 0;
-
         virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) = 0;
-
         virtual void reportPendingActivity(bool hasPendingActivity) = 0;
 
-        virtual void workerContextDestroyed() = 0;
+        // No need to notify the parent page context when dedicated workers are closing.
+        virtual void workerContextClosed() { }
     };
 
 } // namespace WebCore