[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 8f318ab849073c311b8cb709ce95ba3300970c15
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 19:17:11 2010 +0000

    2010-10-28  Kinuko Yasuda  <kinuko at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Support FileSystem in chromium DRT
            https://bugs.webkit.org/show_bug.cgi?id=47643
            Update the chromium DEPS to pick up corresponding webkit_support change.
            Also add a temporary glue implementation with FIXME comment to
            WebFrameClient::openFileSystem.
    
            * DEPS:
            * public/WebFrameClient.h:
            (WebKit::WebFrameClient::openFileSystem):
    2010-10-28  Kinuko Yasuda  <kinuko at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Support FileSystem in chromium DRT
            https://bugs.webkit.org/show_bug.cgi?id=47643
    
            * DumpRenderTree/chromium/WebViewHost.cpp:
            (WebViewHost::openFileSystem): Added.
            * DumpRenderTree/chromium/WebViewHost.h:
            (WebViewHost::openFileSystem): Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index eba6d54..188078c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-28  Kinuko Yasuda  <kinuko at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Support FileSystem in chromium DRT
+        https://bugs.webkit.org/show_bug.cgi?id=47643
+        Update the chromium DEPS to pick up corresponding webkit_support change.
+        Also add a temporary glue implementation with FIXME comment to
+        WebFrameClient::openFileSystem.
+
+        * DEPS:
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::openFileSystem):
+
 2010-10-28  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index d797478..aaf0b0a 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '63722'
+  'chromium_rev': '64214'
 }
 
 deps = {
diff --git a/WebKit/chromium/public/WebFrameClient.h b/WebKit/chromium/public/WebFrameClient.h
index 458604e..c5cfc21 100644
--- a/WebKit/chromium/public/WebFrameClient.h
+++ b/WebKit/chromium/public/WebFrameClient.h
@@ -355,10 +355,8 @@ public:
         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*) { }
+    // FIXME: This method should be deleted once chromium implements the new method above.
+    virtual void openFileSystem(WebFrame* frame, WebFileSystem::Type type, long long size, WebFileSystemCallbacks* callbacks) { return openFileSystem(frame, type, size, true, callbacks); }
 
 protected:
     ~WebFrameClient() { }
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6805f5d..754b908 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-28  Kinuko Yasuda  <kinuko at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Support FileSystem in chromium DRT
+        https://bugs.webkit.org/show_bug.cgi?id=47643
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::openFileSystem): Added.
+        * DumpRenderTree/chromium/WebViewHost.h:
+        (WebViewHost::openFileSystem): Added.
+
 2010-10-28  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 250473b..9bb0192 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -91,6 +91,7 @@ TestShell::TestShell(bool testShellMode)
 {
     WebRuntimeFeatures::enableGeolocation(true);
     WebRuntimeFeatures::enableIndexedDatabase(true);
+    WebRuntimeFeatures::enableFileSystem(true);
     m_accessibilityController.set(new AccessibilityController(this));
     m_layoutTestController.set(new LayoutTestController(this));
     m_eventSender.set(new EventSender(this));
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index 9767605..847e7dc 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -1053,6 +1053,11 @@ bool WebViewHost::allowScript(WebFrame*, bool enabledPerSettings)
     return enabledPerSettings;
 }
 
+void WebViewHost::openFileSystem(WebFrame* frame, WebFileSystem::Type type, long long size, bool create, WebFileSystemCallbacks* callbacks)
+{
+    webkit_support::OpenFileSystem(frame, type, size, create, callbacks);
+}
+
 // Public functions -----------------------------------------------------------
 
 WebViewHost::WebViewHost(TestShell* shell)
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
index ea70574..1380ebd 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
@@ -192,6 +192,7 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     virtual void didDisplayInsecureContent(WebKit::WebFrame*);
     virtual void didRunInsecureContent(WebKit::WebFrame*, const WebKit::WebSecurityOrigin&);
     virtual bool allowScript(WebKit::WebFrame*, bool enabledPerSettings);
+    virtual void openFileSystem(WebKit::WebFrame*, WebKit::WebFileSystem::Type, long long size, bool create, WebKit::WebFileSystemCallbacks*);
 
 private:
     LayoutTestController* layoutTestController() const;

-- 
WebKit Debian packaging