Changeset 65529 in webkit

Timestamp:

Aug 17, 2010 12:00:10 PM (14 years ago)

Author:

Martin Robinson

Message:

2010-08-17 Martin Robinson <​mrobinson@igalia.com>

[GTK] Clean up WebCore/platform/graphics/gtk/ImageGtk.cpp
​https://bugs.webkit.org/show_bug.cgi?id=44069

No new tests as functionality has not changed.

• GNUmakefile.am: Add WEBKITGTK_API_VERSION_STRING definition, which allows WebCore to use this as well.
• platform/graphics/gtk/ImageGtk.cpp: (getWebKitDataDirectory): Added this helper. (WebCore::Image::loadPlatformResource): Use GOwnPtr for gchar pointers and use the new getWebKitDataDirectory helper.
• platform/gtk/GOwnPtrGtk.cpp: Move the GtkIconInfo template specialization to this file. (WTF::GtkIconInfo): Added this forward declaration.
• platform/gtk/GOwnPtrGtk.h: Declaration for new template specialization.

2010-08-17 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Clean up WebCore/platform/graphics/gtk/ImageGtk.cpp
​https://bugs.webkit.org/show_bug.cgi?id=44069

• WebCoreSupport/InspectorClientGtk.cpp: (WebKit::InspectorClient::openInspectorFrontend): Switched to using the new WEBKITGTK_API_VERSION_STRING define.
• webkit/webkitprivate.cpp: (inspectorGSettings): Ditto.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (2 diffs)
• WebCore/platform/graphics/gtk/ImageGtk.cpp (modified) (3 diffs)
• WebCore/platform/gtk/GOwnPtrGtk.cpp (modified) (2 diffs)
• WebCore/platform/gtk/GOwnPtrGtk.h (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-17  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Clean up WebCore/platform/graphics/gtk/ImageGtk.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44069
+
+        No new tests as functionality has not changed.
+
+        * GNUmakefile.am: Add WEBKITGTK_API_VERSION_STRING definition, which
+        allows WebCore to use this as well.
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (getWebKitDataDirectory): Added this helper.
+        (WebCore::Image::loadPlatformResource): Use GOwnPtr for gchar pointers and
+        use the new getWebKitDataDirectory helper.
+        * platform/gtk/GOwnPtrGtk.cpp: Move the GtkIconInfo template specialization to this file.
+        (WTF::GtkIconInfo): Added this forward declaration.
+        * platform/gtk/GOwnPtrGtk.h: Declaration for new template specialization.
+
 2010-08-17  Stephen White  <senorblanco@chromium.org>
 

trunk/WebCore/GNUmakefile.am

@@ -70 +70 @@
 
 webcoregtk_cppflags += \
+        -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
         -DWTF_USE_SOUP=1 \
         -DWTF_USE_GSTREAMER=1 \
@@ -4623 +4624 @@
         $(shell ls $(WebCore)/inspector/front-end/Images/*.png)
 
-webresourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/images
+webresourcesdir = ${datadir}/webkitgtk-@WEBKITGTK_API_VERSION@/images
 dist_webresources_DATA = \
         $(WebCore)/Resources/textAreaResizeCorner.png \

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

@@ -28 +28 @@
 #include "BitmapImage.h"
 #include "CairoUtilities.h"
-#include "GOwnPtr.h"
+#include "GOwnPtrGtk.h"
 #include "SharedBuffer.h"
 #include <wtf/text/CString.h>
@@ -34 +34 @@
 #include <gtk/gtk.h>
 
-#ifdef _WIN32
-#  include <mbstring.h>
-#  include <shlobj.h>
-/* search for data relative to where we are installed */
+#if PLATFORM(WIN)
+#include <mbstring.h>
+#include <shlobj.h>
 
 static HMODULE hmodule;
 
-#ifdef __cplusplus
 extern "C" {
-#endif
-BOOL WINAPI
-DllMain(HINSTANCE hinstDLL,
-    DWORD     fdwReason,
-    LPVOID    lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    switch (fdwReason) {
-    case DLL_PROCESS_ATTACH:
+    if (fdwReason == DLL_PROCESS_ATTACH)
         hmodule = hinstDLL;
-        break;
-    }
-
     return TRUE;
 }
-#ifdef __cplusplus
 }
-#endif
 
-static char *
-get_webkit_datadir(void)
+static const char* getWebKitDataDirectory()
 {
-    static char retval[1000];
-    static int beenhere = 0;
+    static char* dataDirectory = 0;
+    if (dataDirectory)
+        return dataDirectory;
 
-    unsigned char *p;
-
-    if (beenhere)
-        return retval;
-
-    if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10))
+    dataDirectory = new char[PATH_MAX];
+    if (!GetModuleFileName(hmodule, static_cast<CHAR*>(dataDirectory), sizeof(dataDirectory) - 10))
         return DATA_DIR;
 
-    p = _mbsrchr((const unsigned char *) retval, '\\');
+    // 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((const unsigned char *) retval, '\\');
+    p = _mbsrchr(static_cast<const unsigned char *>(dataDirectory), '\\');
     if (p) {
         if (!stricmp((const char *) (p+1), "bin"))
             *p = '\0';
     }
-    strcat(retval, "\\share");
+    strcat(dataDirectory, "\\share");
 
-    beenhere = 1;
-
-    return retval;
+    return dataDirectory;
 }
 
-#undef DATA_DIR
-#define DATA_DIR get_webkit_datadir ()
-#endif
+#else
 
-
-namespace WTF {
-
-template <> void freeOwnedGPtr<GtkIconInfo>(GtkIconInfo* info)
+static const char* getWebKitDataDirectory()
 {
-    if (info)
-        gtk_icon_info_free(info);
+    return DATA_DIR;
 }
 
-}
+#endif
 
 namespace WebCore {
@@ -159 +138 @@
         fileName = getThemeIconFileName(GTK_STOCK_MISSING_IMAGE, 16);
     if (fileName.isNull()) {
-        gchar* imagename = g_strdup_printf("%s.png", name);
-        gchar* glibFileName = g_build_filename(DATA_DIR, "webkit-1.0", "images", imagename, NULL);
-        fileName = glibFileName;
-        g_free(imagename);
-        g_free(glibFileName);
+        GOwnPtr<gchar> imageName(g_strdup_printf("%s.png", name));
+        GOwnPtr<gchar> glibFileName(g_build_filename(getWebKitDataDirectory(), "webkitgtk-"WEBKITGTK_API_VERSION_STRING, "images", imageName.get(), NULL));
+        fileName = glibFileName.get();
     }
 

trunk/WebCore/platform/gtk/GOwnPtrGtk.cpp

@@ -20 +20 @@
 #include "GOwnPtrGtk.h"
 
-#include <gdk/gdk.h>
-#include <glib.h>
+#include <gtk/gtk.h>
 
 namespace WTF {
@@ -31 +30 @@
 }
 
+template <> void freeOwnedGPtr<GtkIconInfo>(GtkIconInfo* info)
+{
+    if (info)
+        gtk_icon_info_free(info);
 }
+
+}

trunk/WebCore/platform/gtk/GOwnPtrGtk.h

@@ -24 +24 @@
 
 typedef union _GdkEvent GdkEvent;
+typedef struct _GtkIconInfo GtkIconInfo;
 
 namespace WTF {
 
-template<> void freeOwnedGPtr<GdkEvent>(GdkEvent*);
+template <> void freeOwnedGPtr<GdkEvent>(GdkEvent*);
+template <> void freeOwnedGPtr<GtkIconInfo>(GtkIconInfo*);
 
 }

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-08-17  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Clean up WebCore/platform/graphics/gtk/ImageGtk.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44069
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::openInspectorFrontend): Switched to using the new WEBKITGTK_API_VERSION_STRING define.
+        * webkit/webkitprivate.cpp:
+        (inspectorGSettings): Ditto.
+
 2010-08-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

@@ -88 +88 @@
         inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
     } else {
-        GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
-        inspectorURI.set(g_filename_to_uri(dataPath.get(), NULL, NULL));
+        inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkitgtk-"WEBKITGTK_API_VERSION_STRING"/webinspector/inspector.html", NULL, NULL));
     }
 

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -238 +238 @@
         return settings;
 
-    GOwnPtr<gchar> schemaID(g_strdup_printf("org.webkitgtk-%.1f.inspector", WEBKITGTK_API_VERSION));
+    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector"
 
     // Unfortunately GSettings will abort the process execution if the
@@ -244 +244 @@
     // tests, or even the introspection dump at build time, so check
     // if we have the schema before trying to initialize it.
-    if (!isSchemaAvailable(schemaID.get())) {
+    if (!isSchemaAvailable(schemaID)) {
         g_warning("GSettings schema not found - settings will not be used or saved.");
         return 0;
     }
 
-    settings = g_settings_new(schemaID.get());
+    settings = g_settings_new(schemaID);
 
     return settings;