[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 a5c05c5ead8f78e37fd98df6e324c261ba3e2de4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 17:01:07 2010 +0000

    2010-10-05  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Kent Tamura.
    
            [BREWMP] Use PlatformRefPtr instead of OwnPtr in FileSystem
            https://bugs.webkit.org/show_bug.cgi?id=47025
    
            PlatformRefPtr is a better choice here because all Brew MP instances are
            reference counted.
    
            * platform/brew/FileSystemBrew.cpp:
            (WebCore::getFileSize):
            (WebCore::fileExists):
            (WebCore::deleteFile):
            (WebCore::deleteEmptyDirectory):
            (WebCore::canonicalPath):
            (WebCore::makeAllDirectories):
            (WebCore::openTemporaryFile):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b515ec..6f7d619 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-05  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Kent Tamura.
+
+        [BREWMP] Use PlatformRefPtr instead of OwnPtr in FileSystem
+        https://bugs.webkit.org/show_bug.cgi?id=47025
+
+        PlatformRefPtr is a better choice here because all Brew MP instances are
+        reference counted.
+
+        * platform/brew/FileSystemBrew.cpp:
+        (WebCore::getFileSize):
+        (WebCore::fileExists):
+        (WebCore::deleteFile):
+        (WebCore::deleteEmptyDirectory):
+        (WebCore::canonicalPath):
+        (WebCore::makeAllDirectories):
+        (WebCore::openTemporaryFile):
+
 2010-10-05  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/platform/brew/FileSystemBrew.cpp b/WebCore/platform/brew/FileSystemBrew.cpp
index a723e63..2411c3b 100644
--- a/WebCore/platform/brew/FileSystemBrew.cpp
+++ b/WebCore/platform/brew/FileSystemBrew.cpp
@@ -37,9 +37,8 @@
 #include <AEEFile.h>
 #include <AEEStdLib.h>
 
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RandomNumber.h>
+#include <wtf/brew/RefPtrBrew.h>
 #include <wtf/brew/ShellBrew.h>
 #include <wtf/text/CString.h>
 
@@ -47,7 +46,7 @@ namespace WebCore {
 
 bool getFileSize(const String& path, long long& result)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
     FileInfo info;
 
     if (IFILEMGR_GetInfo(fileMgr.get(), path.utf8().data(), &info) == SUCCESS) {
@@ -67,21 +66,21 @@ bool getFileModificationTime(const String& path, time_t& result)
 
 bool fileExists(const String& path)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     return (IFILEMGR_Test(fileMgr.get(), path.utf8().data()) == SUCCESS);
 }
 
 bool deleteFile(const String& path)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     return (IFILEMGR_Remove(fileMgr.get(), path.utf8().data()) == SUCCESS);
 }
 
 bool deleteEmptyDirectory(const String& path)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     return (IFILEMGR_RmDir(fileMgr.get(), path.utf8().data()) == SUCCESS);
 }
@@ -110,7 +109,7 @@ CString fileSystemRepresentation(const String& path)
 
 static String canonicalPath(const String& path)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     // Get the buffer size required to resolve the path.
     int canonPathLen;
@@ -163,7 +162,7 @@ static bool makeAllDirectories(IFileMgr* fileManager, const String& path)
 
 bool makeAllDirectories(const String& path)
 {
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     return makeAllDirectories(fileMgr.get(), canonicalPath(path));
 }
@@ -193,7 +192,7 @@ CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle)
     // use "fs:/~/tmp" as our temporary directory.
     String tempPath("fs:/~/tmp");
 
-    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+    PlatformRefPtr<IFileMgr> fileMgr = createRefPtrInstance<IFileMgr>(AEECLSID_FILEMGR);
 
     // Create the temporary directory if it does not exist.
     IFILEMGR_MkDir(fileMgr.get(), tempPath.utf8().data());

-- 
WebKit Debian packaging