[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 b2dc5cade29eac5bbbdce28da36e4e17da988554
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 21 00:35:50 2010 +0000

    2010-08-20  Kinuko Yasuda  <kinuko at chromium.org>
    
            Unreviewed; build fix for chromium (and remove duplicated ChangeLog entry).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65770 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e051f86..e13823c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-20  Kinuko Yasuda  <kinuko at chromium.org>
+
+        Unreviewed; build fix for chromium (and remove duplicated ChangeLog entry).
+
 2010-08-20  James Robinson  <jamesr at chromium.org>
 
         Synchronize default of use_accelerated_compositing gyp variable with downstream.  Unreviewed.
@@ -17,16 +21,6 @@
         * src/WebFileSystemCallbacksImpl.cpp: Added.
         * src/WebFileSystemCallbacksImpl.h: Added.
 
-2010-08-20  Kinuko Yasuda  <kinuko at chromium.org>
-
-        Reviewed by Darin Fisher.
-
-        Add chromium-side callback implementation for FileSystem API.
-
-        * WebKit.gyp:
-        * src/WebFileSystemCallbacksImpl.cpp: Added.
-        * src/WebFileSystemCallbacksImpl.h: Added.
-
 2010-08-20  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp b/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp
index 76f299c..d29f86d 100644
--- a/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp
+++ b/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp
@@ -34,7 +34,7 @@
 
 #include "ExceptionCode.h"
 #include "FileSystemCallbacks.h"
-#include "WebFileEntry.h"
+#include "WebFileSystemEntry.h"
 #include "WebFileInfo.h"
 #include "WebString.h"
 #include <wtf/Vector.h>
@@ -66,7 +66,7 @@ void WebFileSystemCallbacksImpl::didReadMetadata(const WebFileInfo& info)
     delete this;
 }
 
-void WebFileSystemCallbacksImpl::didReadDirectory(const WebVector<WebFileEntry>& entries, bool hasMore)
+void WebFileSystemCallbacksImpl::didReadDirectory(const WebVector<WebFileSystemEntry>& entries, bool hasMore)
 {
     ASSERT(m_callbacks);
     for (size_t i = 0; i < entries.size(); ++i)
diff --git a/WebKit/chromium/src/WebFileSystemCallbacksImpl.h b/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
index bccd99f..f3c6bc3 100644
--- a/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
+++ b/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
@@ -42,7 +42,8 @@ class FileSystemCallbacksBase;
 
 namespace WebKit {
 
-class WebFileInfo;
+struct WebFileInfo;
+class WebFileSystemEntry;
 class WebString;
 
 class WebFileSystemCallbacksImpl : public WebFileSystemCallbacks {
@@ -52,7 +53,7 @@ public:
 
     virtual void didSucceed();
     virtual void didReadMetadata(const WebFileInfo& info);
-    virtual void didReadDirectory(const WebVector<WebFileEntry>& entries, bool hasMore);
+    virtual void didReadDirectory(const WebVector<WebFileSystemEntry>& entries, bool hasMore);
     virtual void didOpenFileSystem(const WebString& name, const WebString& rootPath);
     virtual void didFail(WebFileError error);
 

-- 
WebKit Debian packaging