Diff
Modified: trunk/Source/WebCore/ChangeLog (147760 => 147761)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 17:48:28 UTC (rev 147761)
@@ -1,3 +1,24 @@
+2013-04-05 Anders Carlsson <ander...@apple.com>
+
+ Remove dead Chromium code from WebCore/workers
+ https://bugs.webkit.org/show_bug.cgi?id=114039
+
+ Reviewed by Antti Koivisto.
+
+ * workers/WorkerContext.cpp:
+ (WebCore::WorkerContext::importScripts):
+ * workers/WorkerLoaderProxy.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerContextProxy::create):
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::WorkerScriptLoader):
+ (WebCore::WorkerScriptLoader::createResourceRequest):
+ * workers/WorkerScriptLoader.h:
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::workerThread):
+ * workers/chromium/WorkerContextProxyChromium.cpp: Removed.
+ * workers/chromium/WorkerContextProxyChromium.h: Removed.
+
2013-04-05 Ryosuke Niwa <rn...@webkit.org>
Remove Chromium code from WebCore/plugins
Modified: trunk/Source/WebCore/workers/WorkerContext.cpp (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerContext.cpp 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerContext.cpp 2013-04-05 17:48:28 UTC (rev 147761)
@@ -246,7 +246,7 @@
for (Vector<KURL>::const_iterator it = completedURLs.begin(); it != end; ++it) {
RefPtr<WorkerScriptLoader> scriptLoader(WorkerScriptLoader::create());
-#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
scriptLoader->setTargetType(ResourceRequest::TargetIsScript);
#endif
scriptLoader->loadSynchronously(scriptExecutionContext(), *it, AllowCrossOriginRequests);
Modified: trunk/Source/WebCore/workers/WorkerLoaderProxy.h (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2013-04-05 17:48:28 UTC (rev 147761)
@@ -37,12 +37,6 @@
#include <wtf/Forward.h>
#include <wtf/PassOwnPtr.h>
-#if PLATFORM(CHROMIUM)
-namespace WebKit {
-class WebWorkerBase;
-}
-#endif // PLATFORM(CHROMIUM)
-
namespace WebCore {
// A proxy to talk to the loader context. Normally, the document on the main thread
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2013-04-05 17:48:28 UTC (rev 147761)
@@ -241,12 +241,10 @@
};
-#if !PLATFORM(CHROMIUM)
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
{
return new WorkerMessagingProxy(worker);
}
-#endif
WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject)
: m_scriptExecutionContext(workerObject->scriptExecutionContext())
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2013-04-05 17:48:28 UTC (rev 147761)
@@ -51,9 +51,6 @@
, m_failed(false)
, m_identifier(0)
, m_finishing(false)
-#if PLATFORM(CHROMIUM)
- , m_targetType(ResourceRequest::TargetIsWorker)
-#endif
{
}
@@ -109,7 +106,7 @@
{
OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest(m_url));
request->setHTTPMethod("GET");
-#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
request->setTargetType(m_targetType);
#endif
return request.release();
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.h (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.h 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.h 2013-04-05 17:48:28 UTC (rev 147761)
@@ -73,7 +73,7 @@
virtual void didFail(const ResourceError&) OVERRIDE;
virtual void didFailRedirectCheck() OVERRIDE;
-#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
void setTargetType(ResourceRequest::TargetType targetType) { m_targetType = targetType; }
#endif
@@ -96,7 +96,7 @@
bool m_failed;
unsigned long m_identifier;
bool m_finishing;
-#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
ResourceRequest::TargetType m_targetType;
#endif
};
Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (147760 => 147761)
--- trunk/Source/WebCore/workers/WorkerThread.cpp 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2013-04-05 17:48:28 UTC (rev 147761)
@@ -46,11 +46,6 @@
#include "DatabaseTask.h"
#endif
-#if PLATFORM(CHROMIUM)
-#include <public/Platform.h>
-#include <public/WebWorkerRunLoop.h>
-#endif
-
namespace WebCore {
static Mutex& threadSetMutex()
@@ -159,11 +154,6 @@
m_workerContext->script()->forbidExecution();
}
}
-#if PLATFORM(CHROMIUM)
- // The corresponding call to didStopWorkerRunLoop is in
- // ~WorkerScriptController.
- WebKit::Platform::current()->didStartWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_runLoop));
-#endif
WorkerScriptController* script = m_workerContext->script();
#if ENABLE(INSPECTOR)
Deleted: trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.cpp (147760 => 147761)
--- trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.cpp 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.cpp 2013-04-05 17:48:28 UTC (rev 147761)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-#include "config.h"
-#include "WorkerContextProxyChromium.h"
-
-#if ENABLE(WORKERS)
-
-namespace WebCore {
-
-static WorkerContextProxyCreate* s_workerContextProxyCreateFunction = 0;
-
-void setWorkerContextProxyCreateFunction(WorkerContextProxyCreate workerContextProxyCreateFunction)
-{
- s_workerContextProxyCreateFunction = workerContextProxyCreateFunction;
-}
-
-WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
-{
- ASSERT(s_workerContextProxyCreateFunction);
- return s_workerContextProxyCreateFunction(worker);
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.h (147760 => 147761)
--- trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.h 2013-04-05 17:44:22 UTC (rev 147760)
+++ trunk/Source/WebCore/workers/chromium/WorkerContextProxyChromium.h 2013-04-05 17:48:28 UTC (rev 147761)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2013 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Google, Inc. ("Google") 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 APPLE AND ITS 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 APPLE OR ITS 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 WorkerContextProxyChromium_h
-#define WorkerContextProxyChromium_h
-
-#include "WorkerContextProxy.h"
-
-#if ENABLE(WORKERS)
-
-namespace WebCore {
-
-typedef WorkerContextProxy* WorkerContextProxyCreate(Worker*);
-
-void setWorkerContextProxyCreateFunction(WorkerContextProxyCreate);
-
-} // namespace WebCore
-
-#endif
-
-#endif // WorkerContextProxyChromium_h
