Diff
Modified: trunk/Source/WebCore/ChangeLog (102619 => 102620)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 22:04:06 UTC (rev 102620)
@@ -1,3 +1,13 @@
+2011-12-12 David Grogan <[email protected]>
+
+ Fix compilation error when !ENABLE(WORKERS)
+ https://bugs.webkit.org/show_bug.cgi?id=74029
+
+ Reviewed by Yury Semikhatsky.
+
+ * storage/IDBFactory.cpp:
+ (WebCore::IDBFactory::open): add #if ENABLE(WORKERS) guard
+
2011-12-12 Brady Eidson <[email protected]>
Page cache should support pages with plugins.
Modified: trunk/Source/WebCore/storage/IDBFactory.cpp (102619 => 102620)
--- trunk/Source/WebCore/storage/IDBFactory.cpp 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebCore/storage/IDBFactory.cpp 2011-12-12 22:04:06 UTC (rev 102620)
@@ -97,9 +97,13 @@
m_backend->open(name, request.get(), context->securityOrigin(), frame, String());
return request;
}
+#if ENABLE(WORKERS)
RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), 0);
m_backend->openFromWorker(name, request.get(), context->securityOrigin(), static_cast<WorkerContext*>(context), String());
return request;
+#else
+ return 0;
+#endif
}
PassRefPtr<IDBVersionChangeRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
Modified: trunk/Source/WebKit/chromium/ChangeLog (102619 => 102620)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-12 22:04:06 UTC (rev 102620)
@@ -1,3 +1,18 @@
+2011-12-12 David Grogan <[email protected]>
+
+ Fix compilation error when !ENABLE(WORKERS)
+ https://bugs.webkit.org/show_bug.cgi?id=74029
+
+ Reviewed by Yury Semikhatsky.
+
+ * features.gypi:
+ * src/IDBFactoryBackendProxy.cpp:
+ (WebKit::IDBFactoryBackendProxy::openFromWorker):
+ * src/PlatformSupport.cpp:
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgent::disconnectEventAsText):
+ * src/WebWorkerRunLoop.cpp:
+
2011-12-12 Shawn Singh <[email protected]>
[chromium] Remove assumption that empty surface is always at end of list
Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (102619 => 102620)
--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2011-12-12 22:04:06 UTC (rev 102620)
@@ -92,6 +92,7 @@
void IDBFactoryBackendProxy::openFromWorker(const String& name, IDBCallbacks* callbacks, PassRefPtr<SecurityOrigin> prpOrigin, WorkerContext* context, const String& dataDir)
{
+#if ENABLE(WORKERS)
WebSecurityOrigin origin(prpOrigin);
if (!allowIDBFromWorkerThread(context, name, origin)) {
callbacks->onError(WebIDBDatabaseError(0, "The user denied permission to access the database."));
@@ -101,6 +102,7 @@
NewWebWorkerBase* webWorker = static_cast<NewWebWorkerBase*>(workerLoaderProxy);
WebFrame* webFrame = webWorker->view()->mainFrame();
m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir);
+#endif
}
void IDBFactoryBackendProxy::open(const String& name, IDBCallbacks* callbacks, PassRefPtr<SecurityOrigin> prpOrigin, Frame* frame, const String& dataDir)
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (102619 => 102620)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-12-12 22:04:06 UTC (rev 102620)
@@ -1122,6 +1122,7 @@
return false;
}
+#if ENABLE(WORKERS)
void PlatformSupport::didStartWorkerRunLoop(WorkerRunLoop* loop)
{
webKitPlatformSupport()->didStartWorkerRunLoop(WebWorkerRunLoop(loop));
@@ -1132,7 +1133,6 @@
webKitPlatformSupport()->didStopWorkerRunLoop(WebWorkerRunLoop(loop));
}
-#if ENABLE(WORKERS)
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
{
return WebWorkerClientImpl::createWorkerContextProxy(worker);
Modified: trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (102619 => 102620)
--- trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp 2011-12-12 22:04:06 UTC (rev 102620)
@@ -385,8 +385,10 @@
}
String m_message;
} channel;
+#if ENABLE(WORKERS)
InspectorFrontend::Worker inspector(&channel);
inspector.disconnectedFromWorker();
+#endif
return channel.m_message;
}
Modified: trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp (102619 => 102620)
--- trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp 2011-12-12 22:00:31 UTC (rev 102619)
+++ trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp 2011-12-12 22:04:06 UTC (rev 102620)
@@ -25,6 +25,8 @@
#include "config.h"
#include "WebWorkerRunLoop.h"
+#if ENABLE(WORKERS)
+
#include "WorkerRunLoop.h"
using namespace WebCore;
@@ -77,3 +79,5 @@
}
}
+
+#endif // ENABLE(WORKERS)
