Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (105686 => 105687)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-24 04:23:41 UTC (rev 105686)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-24 04:38:29 UTC (rev 105687)
@@ -1,3 +1,14 @@
+2012-01-23 Tom Sepez <[email protected]>
+
+ [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 <[email protected]>
[Chromium] Implement layoutTestController.workerThreadCount in DRT
Modified: trunk/Source/WebKit/chromium/public/WebSharedWorker.h (105686 => 105687)
--- trunk/Source/WebKit/chromium/public/WebSharedWorker.h 2012-01-24 04:23:41 UTC (rev 105686)
+++ trunk/Source/WebKit/chromium/public/WebSharedWorker.h 2012-01-24 04:38:29 UTC (rev 105687)
@@ -58,25 +58,13 @@
// 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:
Modified: trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp (105686 => 105687)
--- trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2012-01-24 04:23:41 UTC (rev 105686)
+++ trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2012-01-24 04:38:29 UTC (rev 105687)
@@ -361,11 +361,6 @@
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);
Modified: trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h (105686 => 105687)
--- trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h 2012-01-24 04:23:41 UTC (rev 105686)
+++ trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h 2012-01-24 04:38:29 UTC (rev 105687)
@@ -97,8 +97,6 @@
// 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*);
