Changeset 30092 in webkit

Timestamp:

Feb 8, 2008 8:24:14 AM (16 years ago)

Author:

Adam Roben

Message:

2008-02-08 Rodney Dawes <​dobey@wayofthemonkey.com>

Reviewed by Jon Honeycutt.

Redefine some platform-specific types as cross-platform types
Add pathGetFileName method to get the filename from a path string
Add unloadModule method to unload a loadable module from the process
Implement new methods for GTK+ and Windows
Implement missing homeDirectoryPath method for GTK+
Add stub methods for new and missing methods for Wx and Qt

• platform/FileSystem.h:
• platform/gtk/FileSystemGtk.cpp:
• platform/qt/FileSystemQt.cpp:
• platform/win/FileSystemWin.cpp:
• platform/wx/FileSystemWx.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/FileSystem.h (modified) (4 diffs)
• platform/gtk/FileSystemGtk.cpp (modified) (2 diffs)
• platform/qt/FileSystemQt.cpp (modified) (3 diffs)
• platform/win/FileSystemWin.cpp (modified) (2 diffs)
• platform/wx/FileSystemWx.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-08  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Redefine some platform-specific types as cross-platform types
+        Add pathGetFileName method to get the filename from a path string
+        Add unloadModule method to unload a loadable module from the process
+        Implement new methods for GTK+ and Windows
+        Implement missing homeDirectoryPath method for GTK+
+        Add stub methods for new and missing methods for Wx and Qt
+
+        * platform/FileSystem.h:
+        * platform/gtk/FileSystemGtk.cpp:
+        * platform/qt/FileSystemQt.cpp:
+        * platform/win/FileSystemWin.cpp:
+        * platform/wx/FileSystemWx.cpp:
+
 2008-02-08  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/FileSystem.h

@@ -31 +31 @@
 #define FileSystem_h
 
+#if PLATFORM(GTK)
+#include <gmodule.h>
+#endif
+
 #include <wtf/Platform.h>
 
@@ -42 +46 @@
 #if PLATFORM(WIN)
 typedef HANDLE PlatformFileHandle;
+typedef FILETIME PlatformFileTime;
+typedef HMODULE PlatformModule;
 const PlatformFileHandle invalidPlatformFileHandle = INVALID_HANDLE_VALUE;
 #else
 typedef int PlatformFileHandle;
+typedef time_t PlatformFileTime;
+#if PLATFORM(GTK)
+typedef GModule* PlatformModule;
+#else
+typedef void* PlatformModule;
+#endif
 const PlatformFileHandle invalidPlatformFileHandle = -1;
 #endif
@@ -56 +68 @@
 bool makeAllDirectories(const String& path);
 String homeDirectoryPath();
+String pathGetFileName(const String&);
 
 CString fileSystemRepresentation(const String&);
@@ -65 +78 @@
 void closeFile(PlatformFileHandle&);
 int writeToFile(PlatformFileHandle, const char* data, int length);
+
+// Methods for dealing with loadable modules
+bool unloadModule(PlatformModule);
 
 #if PLATFORM(WIN)

trunk/WebCore/platform/gtk/FileSystemGtk.cpp

@@ -114 +114 @@
 }
 
+String homeDirectoryPath()
+{
+    return String::fromUTF8(g_get_home_dir());
+}
+
+String pathGetFileName(const String& pathName)
+{
+    char* baseName = g_path_get_basename(pathName.utf8().data());
+    String fileName = String::fromUTF8(baseName);
+    g_free(baseName);
+
+    return fileName;
+}
+
 CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle)
 {
@@ -153 +167 @@
     return totalBytesWritten;
 }
+
+bool unloadModule(PlatformModule module)
+{
+    return g_module_close(module);
 }
+}

trunk/WebCore/platform/qt/FileSystemQt.cpp

@@ -3 +3 @@
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * Copyright (C) 2008 Apple, Inc. All rights reserved.
+ * Copyright (C) 2008 Collabora, Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +30 @@
  */
 
+#include "config.h"
+#include "FileSystem.h"
+
+#include "CString.h"
 #include "NotImplemented.h"
 #include "PlatformString.h"
@@ -76 +81 @@
 }
 
+String pathGetFileName(const String&)
+{
+    notImplemented();
+    return String();
+}
+
+bool unloadModule(PlatformModule)
+{
+    notImplemented();
+    return false;
+}
+
 }
 

trunk/WebCore/platform/win/FileSystemWin.cpp

@@ -127 +127 @@
 }
 
+String pathGetFileName(const String& path)
+{
+    return String(PathFindFileName(String(path).charactersWithNullTermination()));
+}
+
 static String bundleName()
 {
@@ -215 +220 @@
     return static_cast<int>(bytesWritten);
 }
+
+bool unloadModule(PlatformModule module)
+{
+    return ::FreeLibrary(module);
+}
+
 String localUserSpecificStorageDirectory()
 {

trunk/WebCore/platform/wx/FileSystemWx.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2007 Kevin Ollivier
+ * Copyright (C) 2008 Collabora, Ltd.
+ *
  * All rights reserved.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -76 +78 @@
 }
 
+String homeDirectoryPath()
+{
+    notImplemented();
+    return String();
 }
+
+String pathGetFileName(const String&)
+{
+    notImplemented();
+    return String();
+}
+
+CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle)
+{
+    notImplemented();
+    handle = invalidPlatformFileHandle;
+    return CString();
+}
+
+void closeFile(PlatformFileHandle&)
+{
+    notImplemented();
+}
+
+int writeToFile(PlatformFileHandle, const char* data, int length)
+{
+    notImplemented();
+    return 0;
+}
+
+bool unloadModule(PlatformModule)
+{
+    notImplemented();
+    return false;
+}
+
+}