Changeset 108206 in webkit

Timestamp:

Feb 19, 2012 9:24:14 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Can't find webinspector and error page redirection on Windows
​https://bugs.webkit.org/show_bug.cgi?id=51616

Source/WebCore:

Create and use an abstraction for finding shared resources on Windows.

Patch by Paweł Forysiuk <​tuxator@o2.pl> on 2012-02-19
Reviewed by Martin Robinson.

• platform/FileSystem.h:

(WebCore):

• platform/audio/gtk/AudioBusGtk.cpp:

(WebCore::AudioBus::loadPlatformResource):

• platform/graphics/gtk/ImageGtk.cpp:

(WebCore::getPathToImageResource):

• platform/gtk/FileSystemGtk.cpp:

(WebCore::sharedResourcesPath):
(WebCore):

Source/WebKit/gtk:

Use an abstraction for finding shared resources on Windows.

Patch by Paweł Forysiuk <​tuxator@o2.pl> on 2012-02-19
Reviewed by Martin Robinson.

• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::dispatchDidFailLoad):

• WebCoreSupport/InspectorClientGtk.cpp:

(WebKit::InspectorClient::inspectorFilesPath):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/FileSystem.h (modified) (1 diff)
• WebCore/platform/audio/gtk/AudioBusGtk.cpp (modified) (2 diffs)
• WebCore/platform/graphics/gtk/ImageGtk.cpp (modified) (3 diffs)
• WebCore/platform/gtk/FileSystemGtk.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-19  Paweł Forysiuk  <tuxator@o2.pl>
+
+        [GTK] Can't find webinspector and error page redirection on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=51616
+
+        Create and use an abstraction for finding shared resources on Windows.
+
+        Reviewed by Martin Robinson.
+
+        * platform/FileSystem.h:
+        (WebCore):
+        * platform/audio/gtk/AudioBusGtk.cpp:
+        (WebCore::AudioBus::loadPlatformResource):
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (WebCore::getPathToImageResource):
+        * platform/gtk/FileSystemGtk.cpp:
+        (WebCore::sharedResourcesPath):
+        (WebCore):
+
 2012-02-19  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/platform/FileSystem.h

@@ -199 +199 @@
 String filenameForDisplay(const String&);
 CString applicationDirectoryPath();
+CString sharedResourcesPath();
 uint64_t getVolumeFreeSizeForPath(const char*);
 #endif

trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp

@@ -24 +24 @@
 
 #include "AudioFileReader.h"
+#include "FileSystem.h"
 #include "GOwnPtr.h"
 
@@ -34 +35 @@
 {
     GOwnPtr<gchar> filename(g_strdup_printf("%s.wav", name));
-    GOwnPtr<gchar> absoluteFilename(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, "resources", "audio", filename.get(), NULL));
+    GOwnPtr<gchar> absoluteFilename(g_build_filename(sharedResourcesPath().data(), "resources", "audio", filename.get(), NULL));
 
     GFile* file = g_file_new_for_path(filename.get());

trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp

@@ -27 +27 @@
 
 #include "BitmapImage.h"
+#include "FileSystem.h"
 #include "GdkCairoUtilities.h"
 #include "GOwnPtrGtk.h"
@@ -34 +35 @@
 #include <gtk/gtk.h>
 
-#if PLATFORM(WIN)
-#include <mbstring.h>
-#include <shlobj.h>
-
-static HMODULE hmodule;
-
-extern "C" {
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    if (fdwReason == DLL_PROCESS_ATTACH)
-        hmodule = hinstDLL;
-    return TRUE;
-}
-}
-
-static char* getPathToImageResource(char* resource)
-{
-    static char* dataDirectory = 0;
-    if (!dataDirectory) {
-        dataDirectory = new char[PATH_MAX];
-        if (!GetModuleFileName(hmodule, static_cast<CHAR*>(dataDirectory), sizeof(dataDirectory) - 10))
-            dataDirectory = DATA_DIR;
-
-        // FIXME: This is pretty ugly. Ideally we should be using Windows API
-        // functions or GLib methods to calculate paths.
-        unsigned char *p;
-        p = _mbsrchr(static_cast<const unsigned char *>(dataDirectory), '\\');
-        *p = '\0';
-        p = _mbsrchr(static_cast<const unsigned char *>(dataDirectory), '\\');
-        if (p) {
-            if (!stricmp((const char *) (p+1), "bin"))
-                *p = '\0';
-        }
-        strcat(dataDirectory, "\\share\\webkitgtk-"WEBKITGTK_API_VERSION_STRING"\\images\\");
-    }
-
-    char* imageResourcePath = new char[PATH_MAX];
-    strcat(imageResourcePath, dataDirectory);
-    strcat(imageResourcePath, resource);
-
-    return imageResourcePath;
-}
-
-#else
+namespace WebCore {
 
 static char* getPathToImageResource(char* resource)
@@ -84 +42 @@
         return g_build_filename(g_getenv("WEBKIT_TOP_LEVEL"), "Source", "WebCore", "Resources", resource, NULL);
 
-    return g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, "images", resource, NULL);
+    return g_build_filename(sharedResourcesPath().data(), "images", resource, NULL);
 }
-
-#endif
-
-namespace WebCore {
 
 static CString getThemeIconFileName(const char* name, int size)

trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp

@@ -191 +191 @@
 }
 
+CString sharedResourcesPath()
+{
+    static CString cachedPath;
+    if (!cachedPath.isNull())
+        return cachedPath;
+
+#if OS(WINDOWS)
+    HMODULE hmodule = 0;
+    GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, reinterpret_cast<char*>(sharedResourcesPath), &hmodule);
+
+    GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
+    GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+#else
+    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+#endif
+
+    cachedPath = dataPath.get();
+    return cachedPath;
+}
+
 uint64_t getVolumeFreeSizeForPath(const char* path)
 {

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-02-19  Paweł Forysiuk  <tuxator@o2.pl>
+        [GTK] Can't find webinspector and error page redirection on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=51616
+
+        Use an abstraction for finding shared resources on Windows.
+
+        Reviewed by Martin Robinson.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::inspectorFilesPath):
+
 2012-02-19  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -34 +34 @@
 #include "DocumentLoaderGtk.h"
 #include "ErrorsGtk.h"
+#include "FileSystem.h"
 #include "FormState.h"
 #include "FrameLoader.h"
@@ -1106 +1107 @@
     String content;
     gchar* fileContent = 0;
-    gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
+    GOwnPtr<gchar> errorPath(g_build_filename(sharedResourcesPath().data(), "resources", "error.html", NULL));
+    gchar* errorURI = g_filename_to_uri(errorPath.get(), 0, 0);
+
     GFile* errorFile = g_file_new_for_uri(errorURI);
     g_free(errorURI);

trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

@@ -21 +21 @@
 #include "InspectorClientGtk.h"
 
+#include "FileSystem.h"
 #include "Frame.h"
 #include "InspectorController.h"
@@ -164 +165 @@
         m_inspectorFilesPath.set(g_strdup(environmentPath));
     else
-        m_inspectorFilesPath.set(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, "webinspector", NULL));
+        m_inspectorFilesPath.set(g_build_filename(sharedResourcesPath().data(), "webinspector", NULL));
 
     return m_inspectorFilesPath.get();