diff options
author | dslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 20:09:41 +0000 |
---|---|---|
committer | dslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 20:09:41 +0000 |
commit | 81af1d8a633543753c1da54ba8bf55815765e005 (patch) | |
tree | 7a90eeab79caccdfc282e4df17862fd3b379d7d2 /webkit/tools | |
parent | 6b7438ce43fa5a4fd1e2a17ce58f6a59360d28ed (diff) | |
download | chromium_src-81af1d8a633543753c1da54ba8bf55815765e005.zip chromium_src-81af1d8a633543753c1da54ba8bf55815765e005.tar.gz chromium_src-81af1d8a633543753c1da54ba8bf55815765e005.tar.bz2 |
Removing dedicated worker-related IPC codei (second round).
Review URL: http://codereview.chromium.org/8416029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_web_worker.cc | 41 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_web_worker.h | 86 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 6 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 2 |
5 files changed, 0 insertions, 137 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 7c6b113..694b260 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -93,8 +93,6 @@ 'test_shell_webthemecontrol.cc', 'test_shell_webthemeengine.h', 'test_shell_webthemeengine.cc', - 'test_web_worker.cc', - 'test_web_worker.h', 'test_webview_delegate.cc', 'test_webview_delegate.h', 'test_webview_delegate_gtk.cc', diff --git a/webkit/tools/test_shell/test_web_worker.cc b/webkit/tools/test_shell/test_web_worker.cc deleted file mode 100644 index 3f064c0..0000000 --- a/webkit/tools/test_shell/test_web_worker.cc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "webkit/tools/test_shell/test_web_worker.h" - -TestWebWorker::TestWebWorker() { - AddRef(); // Adds the reference held for worker object. - AddRef(); // Adds the reference held for worker context object. -} - -void TestWebWorker::workerObjectDestroyed() { - Release(); // Releases the reference held for worker object. -} - -void TestWebWorker::workerContextDestroyed() { - Release(); // Releases the reference held for worker context object. -} - -WebKit::WebWorker* TestWebWorker::createWorker( - WebKit::WebWorkerClient* client) { - return NULL; -} - -WebKit::WebNotificationPresenter* TestWebWorker::notificationPresenter() { - return NULL; -} - -WebKit::WebApplicationCacheHost* TestWebWorker::createApplicationCacheHost( - WebKit::WebApplicationCacheHostClient*) { - return NULL; -} - -bool TestWebWorker::allowDatabase(WebKit::WebFrame* frame, - const WebKit::WebString& name, - const WebKit::WebString& display_name, - unsigned long estimated_size) { - return true; -} - -TestWebWorker::~TestWebWorker() {} diff --git a/webkit/tools/test_shell/test_web_worker.h b/webkit/tools/test_shell/test_web_worker.h deleted file mode 100644 index 9c23ccc..0000000 --- a/webkit/tools/test_shell/test_web_worker.h +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEB_WORKER_H_ -#define WEBKIT_TOOLS_TEST_SHELL_TEST_WEB_WORKER_H_ - -#include "base/basictypes.h" -#include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h" - -namespace WebKit { -class WebApplicationCacheHost; -class WebApplicationCacheHostClient; -class WebFrame; -class WebNotificationPresenter; -class WebString; -class WebURL; -} - -// WebWorkers are not functional in test_shell. This class effectively -// stubs things out. -class TestWebWorker : public WebKit::WebWorker, - public WebKit::WebWorkerClient, - public base::RefCounted<TestWebWorker> { - public: - TestWebWorker(); - - // WebWorker methods: - virtual void startWorkerContext(const WebKit::WebURL& script_url, - const WebKit::WebString& user_agent, - const WebKit::WebString& source_code) { - } - virtual void terminateWorkerContext() { - } - virtual void postMessageToWorkerContext( - const WebKit::WebString& message, - const WebKit::WebMessagePortChannelArray& channel) { - } - virtual void workerObjectDestroyed(); - virtual void clientDestroyed() { - } - - // WebWorkerClient methods: - virtual void postMessageToWorkerObject( - const WebKit::WebString& message, - const WebKit::WebMessagePortChannelArray& channel) { - } - virtual void postExceptionToWorkerObject( - const WebKit::WebString& error_message, - int line_number, - const WebKit::WebString& source_url) { - } - virtual void postConsoleMessageToWorkerObject( - int destination_id, - int source_id, - int message_type, - int message_level, - const WebKit::WebString& message, - int line_number, - const WebKit::WebString& source_url) { - } - virtual void confirmMessageFromWorkerObject(bool has_pending_activity) { } - virtual void reportPendingActivity(bool has_pending_activity) { } - virtual void workerContextClosed() { } - virtual void workerContextDestroyed(); - virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client); - virtual WebKit::WebNotificationPresenter* notificationPresenter(); - virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost( - WebKit::WebApplicationCacheHostClient*); - virtual bool allowDatabase(WebKit::WebFrame* frame, - const WebKit::WebString& name, - const WebKit::WebString& display_name, - unsigned long estimated_size); - - private: - friend class base::RefCounted<TestWebWorker>; - - virtual ~TestWebWorker(); - - DISALLOW_COPY_AND_ASSIGN(TestWebWorker); -}; - -#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEB_WORKER_H_ diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 604489f..9231d1d 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -75,7 +75,6 @@ #include "webkit/tools/test_shell/simple_file_system.h" #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell.h" -#include "webkit/tools/test_shell/test_web_worker.h" #if defined(OS_WIN) // TODO(port): make these files work everywhere. @@ -640,11 +639,6 @@ WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame, frame, params, plugins.front().path, AsWeakPtr()); } -WebWorker* TestWebViewDelegate::createWorker(WebFrame* frame, - WebWorkerClient* client) { - return new TestWebWorker(); -} - WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( WebFrame* frame, WebMediaPlayerClient* client) { scoped_ptr<media::MessageLoopFactory> message_loop_factory( diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 3ae8ec6..c1277b0 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -164,8 +164,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient, // WebKit::WebFrameClient virtual WebKit::WebPlugin* createPlugin( WebKit::WebFrame*, const WebKit::WebPluginParams&); - virtual WebKit::WebWorker* createWorker( - WebKit::WebFrame*, WebKit::WebWorkerClient*); virtual WebKit::WebMediaPlayer* createMediaPlayer( WebKit::WebFrame*, WebKit::WebMediaPlayerClient*); virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost( |