[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kinuko at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 438a87f655b3bd9f1f29c19193e2014a1be9ef44
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 02:12:43 2010 +0000

    2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
    
            Unreviewed, another attempt to fix build.  The code didn't have proper if-defs.
    
            * src/WebWorkerBase.cpp:
            (WebKit::WebWorkerBase::openFileSystem):
            * src/WebWorkerBase.h:
            * src/WorkerFileSystemCallbacksBridge.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 55ba896..9f6801e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
 
+        Unreviewed, another attempt to fix build.  The code didn't have proper if-defs.
+
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::openFileSystem):
+        * src/WebWorkerBase.h:
+        * src/WorkerFileSystemCallbacksBridge.h:
+
+2010-09-23  Kinuko Yasuda  <kinuko at chromium.org>
+
         Unreviewed; build fix attempt.
 
         * src/WebWorkerBase.cpp:
diff --git a/WebKit/chromium/src/WebWorkerBase.cpp b/WebKit/chromium/src/WebWorkerBase.cpp
index 135e058..622f5c2 100644
--- a/WebKit/chromium/src/WebWorkerBase.cpp
+++ b/WebKit/chromium/src/WebWorkerBase.cpp
@@ -236,6 +236,7 @@ bool WebWorkerBase::allowDatabase(WebFrame*, const WebString& name, const WebStr
     return bridge->result();
 }
 
+#if ENABLE(FILE_SYSTEM)
 void WebWorkerBase::openFileSystem(WebFileSystem::Type type, long long size, WebFileSystemCallbacks* callbacks)
 {
     WorkerScriptController* controller = WorkerScriptController::controllerForContext();
@@ -244,6 +245,7 @@ void WebWorkerBase::openFileSystem(WebFileSystem::Type type, long long size, Web
     RefPtr<WorkerFileSystemCallbacksBridge> bridge = WorkerFileSystemCallbacksBridge::create(this, workerContext, callbacks);
     bridge->postOpenFileSystemToMainThread(commonClient(), type, size, openFileSystemMode);
 }
+#endif
 
 // WorkerObjectProxy -----------------------------------------------------------
 
diff --git a/WebKit/chromium/src/WebWorkerBase.h b/WebKit/chromium/src/WebWorkerBase.h
index 628d8f1..1f4bc03 100644
--- a/WebKit/chromium/src/WebWorkerBase.h
+++ b/WebKit/chromium/src/WebWorkerBase.h
@@ -91,8 +91,10 @@ public:
     // Controls whether access to Web Databases is allowed for this worker.
     virtual bool allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize);
 
+#if ENABLE(FILE_SYSTEM)
     // Requests to open a file system for this worker. (Note that this is not the implementation for WebFrameClient::openFileSystem.)
     void openFileSystem(WebFileSystem::Type, long long size, WebFileSystemCallbacks*);
+#endif
 
     // Executes the given task on the main thread.
     static void dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
diff --git a/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h b/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
index b5d25ba..5079db1 100644
--- a/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
+++ b/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
@@ -31,6 +31,8 @@
 #ifndef WorkerFileSystemCallbacksBridge_h
 #define WorkerFileSystemCallbacksBridge_h
 
+#if ENABLE(FILE_SYSTEM)
+
 #include "PlatformString.h"
 #include "ScriptExecutionContext.h"
 #include "WebFileError.h"
@@ -115,4 +117,6 @@ private:
 
 } // namespace WebCore
 
+#endif
+
 #endif // WorkerFileSystemCallbacksBridge_h

-- 
WebKit Debian packaging