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

[andreip at google.com]

The following commit has been merged in the debian/experimental branch:
commit d398d7e1c6310178caf220fef6969615c8dd2794
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 9 01:35:13 2010 +0000

    2010-10-08  Andrei Popescu  <andreip at google.com>
    
            Reviewed by Jeremy Orlow.
    
            [Chromium] IDBFactory::open only works in single process mode.
            https://bugs.webkit.org/show_bug.cgi?id=47444
    
            * public/WebIDBFactory.h:
            (WebKit::WebIDBFactory::open):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 85cb313..197c8b7 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Jeremy Orlow.
 
+        [Chromium] IDBFactory::open only works in single process mode.
+        https://bugs.webkit.org/show_bug.cgi?id=47444
+
+        * public/WebIDBFactory.h:
+        (WebKit::WebIDBFactory::open):
+
+2010-10-08  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by Jeremy Orlow.
+
         IndexedDB does not have a quota mechanism.
         https://bugs.webkit.org/show_bug.cgi?id=47389
 
diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h
index 63eeacd..0aa13c7 100755
--- a/WebKit/chromium/public/WebIDBFactory.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -52,9 +52,17 @@ public:
     virtual ~WebIDBFactory() { }
 
     // The WebKit implementation of open ignores the WebFrame* parameter.
-    virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize) { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir, unsigned long long maximumSize)
+    {
+        // FIXME: Remove the line below and renable this assertion.
+        open(name, description, callbacks, origin, webFrame, dataDir);
+        // WEBKIT_ASSERT_NOT_REACHED();
+    }
     // FIXME: Remove once we update Chromium side.
-    virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir)
+    {
+        open(name, description, callbacks, origin, webFrame, dataDir, 5 * 1024 * 1024);
+    }
 
     // The file name that would be used for persisting a given indexed database on the file system.
     WEBKIT_API static WebString databaseFileName(const WebString& name, const WebSecurityOrigin&);

-- 
WebKit Debian packaging