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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 408b491e95b94b2b727a3abaa46c677eb39f30da
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 22:05:53 2010 +0000

    2010-10-12  Kavita Kanetkar  <kkanetkar at chromium.org>
    
            Reviewed by Dumitru Daniliuc.
    
            [FileSystem] Add ability to pass a bool to create or not create root path while opening filesystem.
            https://bugs.webkit.org/show_bug.cgi?id=47519
    
            * public/WebCommonWorkerClient.h:
            (WebKit::WebCommonWorkerClient::openFileSystem):
            * public/WebFrameClient.h:
            (WebKit::WebFrameClient::openFileSystem):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3f1b4a8..07808be 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-12  Kavita Kanetkar  <kkanetkar at chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        [FileSystem] Add ability to pass a bool to create or not create root path while opening filesystem.
+        https://bugs.webkit.org/show_bug.cgi?id=47519
+
+        * public/WebCommonWorkerClient.h:
+        (WebKit::WebCommonWorkerClient::openFileSystem):
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::openFileSystem):
+
 2010-10-12  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Nate Chapin (in person).
diff --git a/WebKit/chromium/public/WebCommonWorkerClient.h b/WebKit/chromium/public/WebCommonWorkerClient.h
index 39d8aa9..b99d39d 100644
--- a/WebKit/chromium/public/WebCommonWorkerClient.h
+++ b/WebKit/chromium/public/WebCommonWorkerClient.h
@@ -87,6 +87,12 @@ public:
     virtual bool allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) = 0;
 
     // Called on the main webkit thread before opening a file system.
+    virtual void openFileSystem(WebFileSystem::Type, long long size, bool create, WebFileSystemCallbacks*)
+    {
+        WEBKIT_ASSERT_NOT_REACHED();
+    }
+
+    // This will be removed once changes in chromium use the new method above.
     virtual void openFileSystem(WebFileSystem::Type, long long size, WebFileSystemCallbacks*)
     {
         WEBKIT_ASSERT_NOT_REACHED();
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index a72e2fd..458604e 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -349,7 +349,13 @@ public:
     // WebFileSystemCallbacks::didOpenFileSystem() must be called with
     // a name and root path for the requested FileSystem when the operation
     // is completed successfully. WebFileSystemCallbacks::didFail() must be
-    // called otherwise.
+    // called otherwise. The create bool is for indicating whether or not to
+    // create root path for file systems if it do not exist.
+    virtual void openFileSystem(
+        WebFrame*, WebFileSystem::Type, long long size,
+        bool create, WebFileSystemCallbacks*) { }
+
+    // This method will be deleted once chromium uses the new method above.
     virtual void openFileSystem(
         WebFrame*, WebFileSystem::Type, long long size,
         WebFileSystemCallbacks*) { }

-- 
WebKit Debian packaging