diff --git a/cef.gyp b/cef.gyp index c6cc0b39a..289418f7b 100644 --- a/cef.gyp +++ b/cef.gyp @@ -677,7 +677,6 @@ 'libcef/browser_settings.h', 'libcef/browser_socket_stream_bridge.cc', 'libcef/browser_socket_stream_bridge.h', - 'libcef/browser_web_worker.h', 'libcef/browser_webcookiejar_impl.cc', 'libcef/browser_webcookiejar_impl.h', 'libcef/browser_webblobregistry_impl.cc', diff --git a/libcef/browser_web_worker.h b/libcef/browser_web_worker.h deleted file mode 100644 index e2ae53a48..000000000 --- a/libcef/browser_web_worker.h +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2009 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 _BROWSER_WEB_WORKER_H -#define _BROWSER_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 currently functional in CEF. This class effectively -// stubs things out. -class BrowserWebWorker : public WebKit::WebWorker, - public WebKit::WebWorkerClient, - public base::RefCounted { - public: - BrowserWebWorker() { - AddRef(); // Adds the reference held for worker object. - AddRef(); // Adds the reference held for worker context object. - } - - // 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() { - Release(); // Releases the reference held for worker object. - } - 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() { - Release(); // Releases the reference held for worker context object. - } - virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client) { - return NULL; - } - virtual WebKit::WebNotificationPresenter* notificationPresenter() { - return NULL; - } - virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost( - WebKit::WebApplicationCacheHostClient*) { - return NULL; - } - virtual bool allowDatabase(WebKit::WebFrame* frame, - const WebKit::WebString& name, - const WebKit::WebString& display_name, - unsigned long estimated_size) { - return true; - } - - private: - friend class base::RefCounted; - - ~BrowserWebWorker() {} - - DISALLOW_COPY_AND_ASSIGN(BrowserWebWorker); -}; - -#endif // _BROWSER_WEB_WORKER_H diff --git a/libcef/browser_webview_delegate.cc b/libcef/browser_webview_delegate.cc index f183ff19d..4db41daaa 100644 --- a/libcef/browser_webview_delegate.cc +++ b/libcef/browser_webview_delegate.cc @@ -12,7 +12,6 @@ #include "browser_file_system.h" #include "browser_impl.h" #include "browser_navigation_controller.h" -#include "browser_web_worker.h" #include "browser_webkit_glue.h" #include "browser_webstoragenamespace_impl.h" #include "browser_zoom_map.h" @@ -117,8 +116,6 @@ using WebKit::WebVector; using WebKit::WebView; using WebKit::WebWidget; using WebKit::WebWindowFeatures; -using WebKit::WebWorker; -using WebKit::WebWorkerClient; using WebKit::WebKeyboardEvent; namespace { @@ -629,11 +626,6 @@ WebPlugin* BrowserWebViewDelegate::createPlugin( frame, params, plugins.front().path, AsWeakPtr()); } -WebWorker* BrowserWebViewDelegate::createWorker( - WebFrame* frame, WebWorkerClient* client) { - return new BrowserWebWorker(); -} - WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer( WebFrame* frame, WebMediaPlayerClient* client) { scoped_ptr message_loop_factory( diff --git a/libcef/browser_webview_delegate.h b/libcef/browser_webview_delegate.h index cd4512bd9..0c9ca1e19 100644 --- a/libcef/browser_webview_delegate.h +++ b/libcef/browser_webview_delegate.h @@ -138,8 +138,6 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient, // WebKit::WebFrameClient virtual WebKit::WebPlugin* createPlugin( WebKit::WebFrame*, const WebKit::WebPluginParams&) OVERRIDE; - virtual WebKit::WebWorker* createWorker( - WebKit::WebFrame*, WebKit::WebWorkerClient*) OVERRIDE; virtual WebKit::WebMediaPlayer* createMediaPlayer( WebKit::WebFrame*, WebKit::WebMediaPlayerClient*) OVERRIDE; virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(