[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 7364d3dc3d4a5758a47ff8700cb5e746def5e155
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 17:26:50 2010 +0000

    2010-10-11  Andrei Popescu  <andreip at google.com>
    
            Reviewed by Jeremy Orlow.
    
            [Chromium] Cleanup WebIDBFactory::open once the Chromium plumbing has landed.
            https://bugs.webkit.org/show_bug.cgi?id=47531
    
            Remove the temporary open() method since the appropriate Chromium plumbing was
            added in http://codereview.chromium.org/3729003/
    
            * public/WebIDBFactory.h:
            (WebKit::WebIDBFactory::open):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a9919e7..cc1672c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-11  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Chromium] Cleanup WebIDBFactory::open once the Chromium plumbing has landed.
+        https://bugs.webkit.org/show_bug.cgi?id=47531
+
+        Remove the temporary open() method since the appropriate Chromium plumbing was
+        added in http://codereview.chromium.org/3729003/
+
+        * public/WebIDBFactory.h:
+        (WebKit::WebIDBFactory::open):
+
 2010-10-13  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h
index 0aa13c7..c7fbe02 100755
--- a/WebKit/chromium/public/WebIDBFactory.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -54,14 +54,7 @@ public:
     // 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)
     {
-        // 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)
-    {
-        open(name, description, callbacks, origin, webFrame, dataDir, 5 * 1024 * 1024);
+        WEBKIT_ASSERT_NOT_REACHED();
     }
 
     // The file name that would be used for persisting a given indexed database on the file system.

-- 
WebKit Debian packaging