Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (87462 => 87463)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-05-27 02:22:41 UTC (rev 87463)
@@ -1,3 +1,26 @@
+2011-05-26 Leandro Gracia Gil <[email protected]>
+
+ Reviewed by Dmitry Titov.
+
+ Add missing compile guards for WebWorkers in WebKit.
+ https://bugs.webkit.org/show_bug.cgi?id=61536
+
+ * src/DatabaseObserver.cpp:
+ (WebCore::DatabaseObserver::canEstablishDatabase):
+ * src/LocalFileSystemChromium.cpp:
+ (WebCore::openFileSystemHelper):
+ * src/PlatformBridge.cpp:
+ * src/WebFileSystemCallbacksImpl.cpp:
+ (WebKit::WebFileSystemCallbacksImpl::didOpenFileSystem):
+ * src/WorkerAsyncFileSystemChromium.cpp:
+ * src/WorkerAsyncFileSystemChromium.h:
+ * src/WorkerAsyncFileWriterChromium.cpp:
+ * src/WorkerAsyncFileWriterChromium.h:
+ * src/WorkerFileSystemCallbacksBridge.cpp:
+ * src/WorkerFileSystemCallbacksBridge.h:
+ * src/WorkerFileWriterCallbacksBridge.cpp:
+ * src/WorkerFileWriterCallbacksBridge.h:
+
2011-05-26 Evan Martin <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Source/WebKit/chromium/src/DatabaseObserver.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/DatabaseObserver.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/DatabaseObserver.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -62,10 +62,14 @@
if (webView->permissionClient())
return webView->permissionClient()->allowDatabase(webFrame, name, displayName, estimatedSize);
} else {
+#if ENABLE(WORKERS)
WorkerContext* workerContext = static_cast<WorkerContext*>(scriptExecutionContext);
WorkerLoaderProxy* workerLoaderProxy = &workerContext->thread()->workerLoaderProxy();
WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);
return webWorker->allowDatabase(0, name, displayName, estimatedSize);
+#else
+ ASSERT_NOT_REACHED();
+#endif
}
return true;
Modified: trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -89,6 +89,7 @@
else
webFrame->client()->openFileSystem(webFrame, static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, type));
} else {
+#if ENABLE(WORKERS)
WorkerContext* workerContext = static_cast<WorkerContext*>(context);
WorkerLoaderProxy* workerLoaderProxy = &workerContext->thread()->workerLoaderProxy();
WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);
@@ -96,6 +97,9 @@
allowed = false;
else
webWorker->openFileSystemForWorker(static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, type, context, synchronous), synchronous);
+#else
+ ASSERT_NOT_REACHED();
+#endif
}
if (!allowed) {
Modified: trunk/Source/WebKit/chromium/src/PlatformBridge.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/PlatformBridge.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/PlatformBridge.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -1047,9 +1047,11 @@
return false;
}
+#if ENABLE(WORKERS)
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
{
return WebWorkerClientImpl::createWorkerContextProxy(worker);
}
+#endif
} // namespace WebCore
Modified: trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -87,11 +87,16 @@
void WebFileSystemCallbacksImpl::didOpenFileSystem(const WebString& name, const WebString& path)
{
- if (m_context && m_context->isWorkerContext())
+ // This object is intended to delete itself on exit.
+ OwnPtr<WebFileSystemCallbacksImpl> callbacks = adoptPtr(this);
+
+#if ENABLE(WORKERS)
+ if (m_context && m_context->isWorkerContext()) {
m_callbacks->didOpenFileSystem(name, WorkerAsyncFileSystemChromium::create(m_context, m_type, path, m_synchronous));
- else
- m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(m_type, path));
- delete this;
+ return;
+ }
+#endif
+ m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(m_type, path));
}
void WebFileSystemCallbacksImpl::didFail(WebFileError error)
Modified: trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#include "config.h"
#include "WorkerAsyncFileSystemChromium.h"
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "AsyncFileSystemCallbacks.h"
#include "FileMetadata.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.h (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.h 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.h 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#ifndef WorkerAsyncFileSystemChromium_h
#define WorkerAsyncFileSystemChromium_h
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "AsyncFileSystem.h"
#include "PlatformString.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#include "config.h"
#include "WorkerAsyncFileWriterChromium.h"
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "AsyncFileSystem.h"
#include "Blob.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.h (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.h 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.h 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#ifndef WorkerAsyncFileWriterChromium_h
#define WorkerAsyncFileWriterChromium_h
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "AsyncFileWriter.h"
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#include "config.h"
#include "WorkerFileSystemCallbacksBridge.h"
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "CrossThreadTask.h"
#include "WebCommonWorkerClient.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#ifndef WorkerFileSystemCallbacksBridge_h
#define WorkerFileSystemCallbacksBridge_h
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "PlatformString.h"
#include "ScriptExecutionContext.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#include "config.h"
#include "WorkerFileWriterCallbacksBridge.h"
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "AsyncFileWriterClient.h"
#include "CrossThreadTask.h"
Modified: trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h (87462 => 87463)
--- trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h 2011-05-27 02:16:21 UTC (rev 87462)
+++ trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h 2011-05-27 02:22:41 UTC (rev 87463)
@@ -31,7 +31,7 @@
#ifndef WorkerFileWriterCallbacksBridge_h
#define WorkerFileWriterCallbacksBridge_h
-#if ENABLE(FILE_SYSTEM)
+#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "WebFileError.h"
#include "WebFileWriterClient.h"
