2006-11-13 Mark Rowe <bdash@webkit.org>

        Reviewed by Mitz.

        Fix some Linux/Gdk build issues noted by Alp Toker.

        * Projects/gdk/webcore-gdk.bkl:
        * WebCoreSources.bkl:
        * platform/graphics/gdk/ImageGdk.cpp:
        (WebCore::Image::loadPlatformResource):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38637f6bf9cacf2074c98aa987dc31c10840bed3..ca533b7a658eb8ad61e8fc7a2eb98f05740d723c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-13  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Mitz.
+
+        Fix some Linux/Gdk build issues noted by Alp Toker.
+
+        * Projects/gdk/webcore-gdk.bkl:
+        * WebCoreSources.bkl:
+        * platform/graphics/gdk/ImageGdk.cpp:
+        (WebCore::Image::loadPlatformResource):
+
 2006-11-12  Brady Eidson <beidson@apple.com>
 
         Reviewed by Anders

diff --git a/WebCore/Projects/gdk/webcore-gdk.bkl b/WebCore/Projects/gdk/webcore-gdk.bkl
index 31c1298e64fb3c3895faa80fb631b7d2c9de47c7..cdaf2561154ee80eeff662227cc65805a81fbc45 100644 (file)
--- a/WebCore/Projects/gdk/webcore-gdk.bkl
+++ b/WebCore/Projects/gdk/webcore-gdk.bkl
@@ -46,7 +46,7 @@
         <define>BUILDING_GDK__</define>
         <define>BUILDING_CAIRO__</define>
         <include>platform/gdk</include>
-        <include>platform/grahpics/cairo</include>
+        <include>platform/graphics/cairo</include>
         <include>$(SRCDIR)/kcanvas/device/cairo</include>
         <define>XPATH_SUPPORT</define>
         <!-- gdk build broken with without NDEBUG defined -->
@@ -61,20 +61,22 @@
             platform/gdk/FontPlatformDataGdk.cpp
             platform/gdk/FrameGdk.cpp
             platform/gdk/GlyphMapGdk.cpp
-            platform/gdk/ImageGdk.cpp
             platform/gdk/KeyEventGdk.cpp
             platform/gdk/MouseEventGdk.cpp
             platform/gdk/PageGdk.cpp
-            platform/network/gdk/ResourceHandleManager.cpp
-            platform/gdk/RenderThemeGdk.cpp
             platform/gdk/RenderPopupMenuGdk.cpp
+            platform/gdk/RenderThemeGdk.cpp
             platform/gdk/ScrollViewGdk.cpp
             platform/gdk/SharedTimerLinux.cpp
             platform/gdk/SystemTimeLinux.cpp
             platform/gdk/TemporaryLinkStubs.cpp
-            platform/network/gdk/ResourceHandleCurl.cpp
             platform/gdk/WheelEventGdk.cpp
             platform/gdk/WidgetGdk.cpp
+            platform/graphics/gdk/ImageGdk.cpp
+            platform/network/gdk/ResourceHandleCurl.cpp
+            platform/network/gdk/ResourceHandleManager.cpp
+
+            $(WEBCORE_SOURCES_PLATFORM_CAIRO)
         </sources>
 
         <clean-files>

diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index 4d45baa72373c851f69a9a23f8e14989873b86a5..d2576b633367c5225bfa3558001dbdb933f2f91a 100644 (file)
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -291,7 +291,7 @@
         platform/image-decoders/xbm/XBMImageDecoder.cpp
     </set>
 
-    <set append="1" var="WEBCORE_SOURCES_CAIRO">
+    <set append="1" var="WEBCORE_SOURCES_PLATFORM_CAIRO">
         platform/graphics/cairo/GraphicsContextCairo.cpp
         platform/graphics/cairo/ImageCairo.cpp
         platform/graphics/cairo/ImageSourceCairo.cpp

diff --git a/WebCore/platform/graphics/gdk/ImageGdk.cpp b/WebCore/platform/graphics/gdk/ImageGdk.cpp
index 5be3ed1291645fe6ed1bdc2c7f8ebd466999a9bd..59cff3eb5918be1028020ab36fe7fe1c3646672e 100644 (file)
--- a/WebCore/platform/graphics/gdk/ImageGdk.cpp
+++ b/WebCore/platform/graphics/gdk/ImageGdk.cpp
@@ -52,11 +52,4 @@ namespace WebCore {
         img->setNativeData(&arr, true);
         return img;
     }
-
-    bool Image::supportsType(const String& type)
-    {
-        // FIXME: Implement.
-        return false;
-    }
-
 }