[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit da37e7347254babc58aa9be89a7fd63529075fcd
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 01:35:26 2010 +0000

    2010-02-17  Stephan Aßmus  <superstippi at gmx.de>
    
            Reviewed by Eric Seidel.
    
            Implemented homeDirectoryPath() and listDirectory() on the Haiku platform.
            https://bugs.webkit.org/show_bug.cgi?id=34687
    
            Covered by existing tests.
    
            * platform/haiku/FileSystemHaiku.cpp:
            (WebCore::homeDirectoryPath): Implemented
            (WebCore::listDirectory): Implemented
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06607bc..8681d44 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-17  Stephan Aßmus  <superstippi at gmx.de>
+
+        Reviewed by Eric Seidel.
+
+        Implemented homeDirectoryPath() and listDirectory() on the Haiku platform.
+        https://bugs.webkit.org/show_bug.cgi?id=34687
+
+        Covered by existing tests.
+
+        * platform/haiku/FileSystemHaiku.cpp:
+        (WebCore::homeDirectoryPath): Implemented
+        (WebCore::listDirectory): Implemented
+
 2010-02-17  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/haiku/FileSystemHaiku.cpp b/WebCore/platform/haiku/FileSystemHaiku.cpp
index 7400cd1..3d9161a 100644
--- a/WebCore/platform/haiku/FileSystemHaiku.cpp
+++ b/WebCore/platform/haiku/FileSystemHaiku.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2007 Ryan Leavengood <leavengood at gmail.com>
+ * Copyright (C) 2010 Stephan Aßmus <superstippi at gmx.de>
  *
  * All rights reserved.
  *
@@ -29,9 +30,14 @@
 #include "FileSystem.h"
 
 #include "CString.h"
+#include "NotImplemented.h"
 #include "PlatformString.h"
 
-#include "NotImplemented.h"
+#include <Directory.h>
+#include <Entry.h>
+#include <File.h>
+#include <FindDirectory.h>
+#include <Path.h>
 
 
 namespace WebCore {
@@ -43,8 +49,11 @@ CString fileSystemRepresentation(const String& string)
 
 String homeDirectoryPath()
 {
-    notImplemented();
-    return String();
+    BPath path;
+    if (find_directory(B_USER_DIRECTORY, &path) != B_OK)
+        return String();
+
+    return String(path.Path());
 }
 
 CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle)
@@ -74,7 +83,10 @@ bool unloadModule(PlatformModule)
 Vector<String> listDirectory(const String& path, const String& filter)
 {
     Vector<String> entries;
-    notImplemented();
+    BDirectory directory(path.utf8().data());
+    entry_ref ref;
+    while (directory.GetNextRef(&ref) == B_OK)
+        entries.append(ref.name);        
     return entries;
 }
 

-- 
WebKit Debian packaging