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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 867c0b52f5fcae66bf482b358e1baf67198e13cb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 26 17:25:26 2010 +0000

    2010-09-26  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Eric Seidel.
    
            [BREWMP] Don't pass PassOwnPtr in makeAllDirectories
            https://bugs.webkit.org/show_bug.cgi?id=42058
    
            Change makeAllDirectories to take a raw FileMgr pointer
            because it is not safe to pass PassOwnPtr recursively.
    
            * platform/brew/FileSystemBrew.cpp:
            (WebCore::makeAllDirectories):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b60f7c3..18ccc28 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-26  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Eric Seidel.
+
+        [BREWMP] Don't pass PassOwnPtr in makeAllDirectories
+        https://bugs.webkit.org/show_bug.cgi?id=42058
+
+        Change makeAllDirectories to take a raw FileMgr pointer
+        because it is not safe to pass PassOwnPtr recursively.
+
+        * platform/brew/FileSystemBrew.cpp:
+        (WebCore::makeAllDirectories):
+
 2010-09-26  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/brew/FileSystemBrew.cpp b/WebCore/platform/brew/FileSystemBrew.cpp
index 6520b81..a723e63 100644
--- a/WebCore/platform/brew/FileSystemBrew.cpp
+++ b/WebCore/platform/brew/FileSystemBrew.cpp
@@ -131,7 +131,7 @@ static String canonicalPath(const String& path)
     return canonPath;
 }
 
-static bool makeAllDirectories(PassOwnPtr<IFileMgr> fileMgr, const String& path)
+static bool makeAllDirectories(IFileMgr* fileManager, const String& path)
 {
     if (path == canonicalPath(AEEFS_HOME_DIR))
         return true;
@@ -144,7 +144,7 @@ static bool makeAllDirectories(PassOwnPtr<IFileMgr> fileMgr, const String& path)
     }
 
     if (lastDivPos > 0) {
-        if (!makeAllDirectories(fileMgr.release(), path.substring(0, lastDivPos)))
+        if (!makeAllDirectories(fileManager, path.substring(0, lastDivPos)))
             return false;
     }
 
@@ -152,10 +152,10 @@ static bool makeAllDirectories(PassOwnPtr<IFileMgr> fileMgr, const String& path)
 
     // IFILEMGR_MkDir return SUCCESS when the file is successfully created or if file already exists.
     // So we need to check fileinfo.attrib.
-    IFILEMGR_MkDir(fileMgr.get(), folder.utf8().data());
+    IFILEMGR_MkDir(fileManager, folder.utf8().data());
 
     FileInfo fileInfo;
-    if (IFILEMGR_GetInfo(fileMgr.get(), folder.utf8().data(), &fileInfo) != SUCCESS)
+    if (IFILEMGR_GetInfo(fileManager, folder.utf8().data(), &fileInfo) != SUCCESS)
         return false;
 
     return fileInfo.attrib & _FA_DIR;
@@ -165,7 +165,7 @@ bool makeAllDirectories(const String& path)
 {
     OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
 
-    return makeAllDirectories(fileMgr.release(), canonicalPath(path));
+    return makeAllDirectories(fileMgr.get(), canonicalPath(path));
 }
 
 String homeDirectoryPath()

-- 
WebKit Debian packaging