Changeset 102620 in webkit

Timestamp:

Dec 12, 2011 2:04:06 PM (12 years ago)

Author:

dgrogan@chromium.org

Message:

Fix compilation error when !ENABLE(WORKERS)
​https://bugs.webkit.org/show_bug.cgi?id=74029

Reviewed by Yury Semikhatsky.

Source/WebCore:

• storage/IDBFactory.cpp:

(WebCore::IDBFactory::open): add #if ENABLE(WORKERS) guard

Source/WebKit/chromium:

• features.gypi:
• src/IDBFactoryBackendProxy.cpp:

(WebKit::IDBFactoryBackendProxy::openFromWorker):

• src/PlatformSupport.cpp:
• src/WebDevToolsAgentImpl.cpp:

(WebKit::WebDevToolsAgent::disconnectEventAsText):

• src/WebWorkerRunLoop.cpp:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/IDBFactory.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/IDBFactoryBackendProxy.cpp (modified) (2 diffs)
• WebKit/chromium/src/PlatformSupport.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebWorkerRunLoop.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  David Grogan  <dgrogan@chromium.org>
+
+        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  <beidson@apple.com>
 

trunk/Source/WebCore/storage/IDBFactory.cpp

@@ -98 +98 @@
         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
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-12-12  David Grogan  <dgrogan@chromium.org>
+
+        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  <shawnsingh@chromium.org>
 

trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp

@@ -93 +93 @@
 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)) {
@@ -102 +103 @@
     WebFrame* webFrame = webWorker->view()->mainFrame();
     m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir);
+#endif
 }
 

trunk/Source/WebKit/chromium/src/PlatformSupport.cpp

@@ -1123 +1123 @@
 }
 
+#if ENABLE(WORKERS)
 void PlatformSupport::didStartWorkerRunLoop(WorkerRunLoop* loop)
 {
@@ -1133 +1134 @@
 }
 
-#if ENABLE(WORKERS)
 WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
 {

trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -386 +386 @@
         String m_message;
     } channel;
+#if ENABLE(WORKERS)
     InspectorFrontend::Worker inspector(&channel);
     inspector.disconnectedFromWorker();
+#endif
     return channel.m_message;
 }

trunk/Source/WebKit/chromium/src/WebWorkerRunLoop.cpp

@@ -25 +25 @@
 #include "config.h"
 #include "WebWorkerRunLoop.h"
+
+#if ENABLE(WORKERS)
 
 #include "WorkerRunLoop.h"
@@ -78 +80 @@
 
 }
+
+#endif // ENABLE(WORKERS)