Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (104716 => 104717)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-11 17:40:58 UTC (rev 104717)
@@ -1,3 +1,13 @@
+2012-01-10 Dmitry Lomov <dslo...@google.com>
+
+ [Chromium] Remove obsolete references to WebWorker class.
+ https://bugs.webkit.org/show_bug.cgi?id=76020
+
+ Reviewed by David Levin.
+
+ * public/WebFrameClient.h:
+ * public/WebSharedWorkerClient.h:
+
2012-01-11 Jochen Eisinger <joc...@chromium.org>
Move the check for canExecuteScripts out of V8Proxy::retrieve
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (104716 => 104717)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-01-11 17:40:58 UTC (rev 104717)
@@ -83,9 +83,6 @@
virtual WebPlugin* createPlugin(WebFrame*, const WebPluginParams&) { return 0; }
// May return null.
- virtual WebWorker* createWorker(WebFrame*, WebSharedWorkerClient*) { return 0; }
-
- // May return null.
virtual WebSharedWorker* createSharedWorker(WebFrame*, const WebURL&, const WebString&, unsigned long long) { return 0; }
// May return null.
Modified: trunk/Source/WebKit/chromium/public/WebSharedWorkerClient.h (104716 => 104717)
--- trunk/Source/WebKit/chromium/public/WebSharedWorkerClient.h 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Source/WebKit/chromium/public/WebSharedWorkerClient.h 2012-01-11 17:40:58 UTC (rev 104717)
@@ -76,11 +76,6 @@
// is owned by the object implementing WebCommonWorkerClient.
virtual WebNotificationPresenter* notificationPresenter() = 0;
- // This can be called on any thread to create a nested WebWorker.
- // WebSharedWorkers are not instantiated via this API - instead
- // they are created via the WebSharedWorkerRepository.
- virtual WebWorker* createWorker(WebSharedWorkerClient*) = 0;
-
// Called on the main webkit thread in the worker process during initialization.
virtual WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) = 0;
Modified: trunk/Tools/ChangeLog (104716 => 104717)
--- trunk/Tools/ChangeLog 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Tools/ChangeLog 2012-01-11 17:40:58 UTC (rev 104717)
@@ -1,3 +1,14 @@
+2012-01-10 Dmitry Lomov <dslo...@google.com>
+
+ [Chromium] Remove obsolete references to WebWorker class.
+ https://bugs.webkit.org/show_bug.cgi?id=76020
+
+ Reviewed by David Levin.
+
+ * DumpRenderTree/chromium/TestWebWorker.h: Removed.
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ * DumpRenderTree/chromium/WebViewHost.h:
+
2012-01-11 Csaba Osztrogonác <o...@webkit.org>
[Qt] Some css3 filter tests are failing after r104698
Deleted: trunk/Tools/DumpRenderTree/chromium/TestWebWorker.h (104716 => 104717)
--- trunk/Tools/DumpRenderTree/chromium/TestWebWorker.h 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Tools/DumpRenderTree/chromium/TestWebWorker.h 2012-01-11 17:40:58 UTC (rev 104717)
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2010 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TestWebWorker_h
-#define TestWebWorker_h
-
-#include "WebMessagePortChannel.h"
-#include "WebSharedWorkerClient.h"
-#include "WebWorker.h"
-#include <wtf/RefCounted.h>
-
-namespace WebKit {
-class WebNotificationPresenter;
-class WebString;
-class WebURL;
-}
-
-class TestWebWorker : public WebKit::WebWorker,
- public WebKit::WebSharedWorkerClient,
- public WTF::RefCounted<TestWebWorker> {
-public:
- TestWebWorker()
- {
- // This class expects refcounting semantics like those found in
- // Chromium's base::RefCounted, so it's OK to call ref() directly.
- relaxAdoptionRequirement();
- ref();
- // The initial counter value should be 2. One for a worker object,
- // another for a worker context object. We need to call ref() just once
- // because the default counter value of RefCounted is 1.
- }
-
- // WebWorker methods:
- virtual void startWorkerContext(const WebKit::WebURL&, const WebKit::WebString&, const WebKit::WebString&) { }
- virtual void terminateWorkerContext() { }
- virtual void postMessageToWorkerContext(const WebKit::WebString&, const WebKit::WebMessagePortChannelArray&) { }
- virtual void workerObjectDestroyed()
- {
- // Releases the reference held for worker object.
- deref();
- }
- virtual void clientDestroyed() { }
-
- // WebWorkerClient methods:
- virtual void postMessageToWorkerObject(const WebKit::WebString&, const WebKit::WebMessagePortChannelArray&) { }
- virtual void postExceptionToWorkerObject(const WebKit::WebString&, int, const WebKit::WebString&) { }
- virtual void postConsoleMessageToWorkerObject(int, int, int, int, const WebKit::WebString&, int, const WebKit::WebString&) { }
- virtual void confirmMessageFromWorkerObject(bool) { }
- virtual void reportPendingActivity(bool) { }
- virtual void workerContextClosed() { }
- virtual void workerContextDestroyed()
- {
- // Releases the reference held for worker context object.
- deref();
- }
- virtual WebKit::WebWorker* createWorker(WebKit::WebSharedWorkerClient*) { return 0; }
- virtual WebKit::WebNotificationPresenter* notificationPresenter() { return 0; }
- virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(WebKit::WebApplicationCacheHostClient*) { return 0; }
- virtual bool allowDatabase(WebKit::WebFrame*, const WebKit::WebString&, const WebKit::WebString&, unsigned long) { return true; }
-
-private:
- ~TestWebWorker() { }
- friend class WTF::RefCounted<TestWebWorker>;
-};
-
-#endif // TestWebWorker_h
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (104716 => 104717)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-01-11 17:40:58 UTC (rev 104717)
@@ -35,7 +35,6 @@
#include "TestNavigationController.h"
#include "TestShell.h"
#include "TestWebPlugin.h"
-#include "TestWebWorker.h"
#include "platform/WebCString.h"
#include "WebConsoleMessage.h"
#include "WebContextMenuData.h"
@@ -844,11 +843,6 @@
return webkit_support::CreateWebPlugin(frame, params);
}
-WebWorker* WebViewHost::createWorker(WebFrame*, WebSharedWorkerClient*)
-{
- return new TestWebWorker();
-}
-
WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerClient* client)
{
return webkit_support::CreateMediaPlayer(frame, client);
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (104716 => 104717)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-01-11 17:36:20 UTC (rev 104716)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-01-11 17:40:58 UTC (rev 104717)
@@ -175,7 +175,6 @@
// WebKit::WebFrameClient
virtual WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&);
- virtual WebKit::WebWorker* createWorker(WebKit::WebFrame*, WebKit::WebSharedWorkerClient*);
virtual WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame*, WebKit::WebMediaPlayerClient*);
virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(WebKit::WebFrame*, WebKit::WebApplicationCacheHostClient*);
virtual void loadURLExternally(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationPolicy);
