[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dumi at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 274154ab9d42f1917d9de97903bb3489bf6245de
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 05:17:55 2009 +0000

    Renaming some parameters passed to DB-related methods to better
    indicate their purpose.
    
    Reviewed by Dimitri Glazkov.
    
    https://bugs.webkit.org/show_bug.cgi?id=31449
    
    WebCore:
    
    * platform/chromium/ChromiumBridge.h:
    
    WebKit/chromium:
    
    * public/WebKitClient.h:
    * src/ChromiumBridge.cpp:
    (WebCore::ChromiumBridge::databaseOpenFile):
    (WebCore::ChromiumBridge::databaseDeleteFile):
    (WebCore::ChromiumBridge::databaseGetFileAttributes):
    (WebCore::ChromiumBridge::databaseGetFileSize):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82f2ac8..0d1d92b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-12  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Renaming some parameters passed to DB-related methods to better
+        indicate their purpose.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31449
+
+        * platform/chromium/ChromiumBridge.h:
+
 2009-11-12  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h
index 0cee4b0..3709f7c 100644
--- a/WebCore/platform/chromium/ChromiumBridge.h
+++ b/WebCore/platform/chromium/ChromiumBridge.h
@@ -118,13 +118,13 @@ namespace WebCore {
         // HTML5 DB -----------------------------------------------------------
 #if ENABLE(DATABASE)
         // Returns a handle to the DB file and ooptionally a handle to its containing directory
-        static PlatformFileHandle databaseOpenFile(const String& fileName, int desiredFlags, PlatformFileHandle* dirHandle = 0);
+        static PlatformFileHandle databaseOpenFile(const String& vfsFleName, int desiredFlags, PlatformFileHandle* dirHandle = 0);
         // Returns a SQLite code (SQLITE_OK = 0, on success)
-        static int databaseDeleteFile(const String& fileName, bool syncDir = false);
+        static int databaseDeleteFile(const String& vfsFileName, bool syncDir = false);
         // Returns the attributes of the DB file
-        static long databaseGetFileAttributes(const String& fileName);
+        static long databaseGetFileAttributes(const String& vfsFileName);
         // Returns the size of the DB file
-        static long long databaseGetFileSize(const String& fileName);
+        static long long databaseGetFileSize(const String& vfsFileName);
 #endif
 
         // JavaScript ---------------------------------------------------------
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 095d784..4754845 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-12  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Renaming some parameters passed to DB-related methods to better
+        indicate their purpose.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31449
+
+        * public/WebKitClient.h:
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::databaseOpenFile):
+        (WebCore::ChromiumBridge::databaseDeleteFile):
+        (WebCore::ChromiumBridge::databaseGetFileAttributes):
+        (WebCore::ChromiumBridge::databaseGetFileSize):
+
 2009-11-12  Adam Barth  <abarth>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h
index 6ff6aa6..3a1e055 100644
--- a/WebKit/chromium/public/WebKitClient.h
+++ b/WebKit/chromium/public/WebKitClient.h
@@ -137,16 +137,16 @@ public:
     // Opens a database file; dirHandle should be 0 if the caller does not need
     // a handle to the directory containing this file
     virtual FileHandle databaseOpenFile(
-        const WebString& fileName, int desiredFlags, FileHandle* dirHandle) = 0;
+        const WebString& vfsFileName, int desiredFlags, FileHandle* dirHandle) = 0;
 
     // Deletes a database file and returns the error code
-    virtual int databaseDeleteFile(const WebString& fileName, bool syncDir) = 0;
+    virtual int databaseDeleteFile(const WebString& vfsFileName, bool syncDir) = 0;
 
     // Returns the attributes of the given database file
-    virtual long databaseGetFileAttributes(const WebString& fileName) = 0;
+    virtual long databaseGetFileAttributes(const WebString& vfsFileName) = 0;
 
     // Returns the size of the given database file
-    virtual long long databaseGetFileSize(const WebString& fileName) = 0;
+    virtual long long databaseGetFileSize(const WebString& vfsFileName) = 0;
 
 
     // Keygen --------------------------------------------------------------
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 8d63c5f..93d92ba 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -306,24 +306,24 @@ String ChromiumBridge::getFontFamilyForCharacters(const UChar* characters, size_
 // HTML5 DB -------------------------------------------------------------------
 
 #if ENABLE(DATABASE)
-PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& fileName, int desiredFlags, PlatformFileHandle* dirHandle)
+PlatformFileHandle ChromiumBridge::databaseOpenFile(const String& vfsFileName, int desiredFlags, PlatformFileHandle* dirHandle)
 {
-    return webKitClient()->databaseOpenFile(WebString(fileName), desiredFlags, dirHandle);
+    return webKitClient()->databaseOpenFile(WebString(vfsFileName), desiredFlags, dirHandle);
 }
 
-int ChromiumBridge::databaseDeleteFile(const String& fileName, bool syncDir)
+int ChromiumBridge::databaseDeleteFile(const String& vfsFileName, bool syncDir)
 {
-    return webKitClient()->databaseDeleteFile(WebString(fileName), syncDir);
+    return webKitClient()->databaseDeleteFile(WebString(vfsFileName), syncDir);
 }
 
-long ChromiumBridge::databaseGetFileAttributes(const String& fileName)
+long ChromiumBridge::databaseGetFileAttributes(const String& vfsFileName)
 {
-    return webKitClient()->databaseGetFileAttributes(WebString(fileName));
+    return webKitClient()->databaseGetFileAttributes(WebString(vfsFileName));
 }
 
-long long ChromiumBridge::databaseGetFileSize(const String& fileName)
+long long ChromiumBridge::databaseGetFileSize(const String& vfsFileName)
 {
-    return webKitClient()->databaseGetFileSize(WebString(fileName));
+    return webKitClient()->databaseGetFileSize(WebString(vfsFileName));
 }
 #endif
 

-- 
WebKit Debian packaging