From 78f5eb75b67c4f3b22a32c9576f2d1f3e1d6297d Mon Sep 17 00:00:00 2001 From: "tsepez@chromium.org" Date: Tue, 24 Jan 2012 04:38:29 +0000 Subject: [PATCH] [chromium] Clean up old WebSharedWorker::startWorkerContext() method. https://bugs.webkit.org/show_bug.cgi?id=76853 Reviewed by Darin Fisher. * public/WebSharedWorker.h: * src/WebSharedWorkerImpl.cpp: * src/WebSharedWorkerImpl.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105687 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/chromium/ChangeLog | 11 +++++++++++ Source/WebKit/chromium/public/WebSharedWorker.h | 14 +------------- Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp | 5 ----- Source/WebKit/chromium/src/WebSharedWorkerImpl.h | 2 -- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index c741505..dd07bba 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,14 @@ +2012-01-23 Tom Sepez + + [chromium] Clean up old WebSharedWorker::startWorkerContext() method. + https://bugs.webkit.org/show_bug.cgi?id=76853 + + Reviewed by Darin Fisher. + + * public/WebSharedWorker.h: + * src/WebSharedWorkerImpl.cpp: + * src/WebSharedWorkerImpl.h: + 2012-01-23 Dmitry Lomov [Chromium] Implement layoutTestController.workerThreadCount in DRT diff --git a/Source/WebKit/chromium/public/WebSharedWorker.h b/Source/WebKit/chromium/public/WebSharedWorker.h index 93bc561..f97ab9e 100644 --- a/Source/WebKit/chromium/public/WebSharedWorker.h +++ b/Source/WebKit/chromium/public/WebSharedWorker.h @@ -58,25 +58,13 @@ public: // FIXME(atwilson): Remove this when we move the initial script loading into the worker process. virtual bool isStarted() = 0; - // API is transitioning from first form to the second. This function must stay virtual for now to prevent breaking chrome on webkit roll. - // DEPRECATED - virtual void startWorkerContext(const WebURL& scriptURL, - const WebString& name, - const WebString& userAgent, - const WebString& sourceCode, - long long scriptResourceAppCacheID) = 0; - - // Chromium will need to fallback to this method to avoid breaking during the next webkit roll. - // It will become a pure virtual method once the chromium side is updated. virtual void startWorkerContext(const WebURL& scriptURL, const WebString& name, const WebString& userAgent, const WebString& sourceCode, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType, - long long scriptResourceAppCacheID) { - startWorkerContext(scriptURL, name, userAgent, sourceCode, scriptResourceAppCacheID); - } + long long scriptResourceAppCacheID) = 0; class ConnectListener { public: diff --git a/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp b/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp index c20d080..7a4bddb 100644 --- a/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp +++ b/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp @@ -361,11 +361,6 @@ void WebSharedWorkerImpl::connectTask(ScriptExecutionContext* context, PassOwnPt workerContext->dispatchEvent(createConnectEvent(port)); } -void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString& name, const WebString& userAgent, const WebString& sourceCode, long long cacheId) -{ - startWorkerContext(url, name, userAgent, sourceCode, "", WebContentSecurityPolicyTypeReportOnly, cacheId); -} - void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString& name, const WebString& userAgent, const WebString& sourceCode, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType policyType, long long) { initializeLoader(url); diff --git a/Source/WebKit/chromium/src/WebSharedWorkerImpl.h b/Source/WebKit/chromium/src/WebSharedWorkerImpl.h index bd32312..b98a2c9 100644 --- a/Source/WebKit/chromium/src/WebSharedWorkerImpl.h +++ b/Source/WebKit/chromium/src/WebSharedWorkerImpl.h @@ -97,8 +97,6 @@ public: // WebSharedWorker methods: virtual bool isStarted(); - // API is transitioning from first form to second form. The methods must remain virtual to avoid breaking chromium on the next webkit roll. - virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& userAgent, const WebString& sourceCode, long long); virtual void startWorkerContext(const WebURL&, const WebString& name, const WebString& userAgent, const WebString& sourceCode, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType, long long cacheId); virtual void connect(WebMessagePortChannel*, ConnectListener*); -- 2.7.4