2011-02-18 Ryuan Choi <ryuan.choi@samsung.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 Feb 2011 03:13:15 +0000 (03:13 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 Feb 2011 03:13:15 +0000 (03:13 +0000)
        Reviewed by Kent Tamura.

        [EFL] Remove GDK dependency.
        https://bugs.webkit.org/show_bug.cgi?id=53978

        Remove checking GDK library.

        * Source/cmake/OptionsEfl.cmake:
2011-02-18  Ryuan Choi  <ryuan.choi@samsung.com>

        Reviewed by Kent Tamura.

        [EFL] Remove GDK dependency.
        https://bugs.webkit.org/show_bug.cgi?id=53978

        Remove GLIB_SUPPORT macro in GDK related code.
        Regardless of GLIB_SUPPORT, getDefaultFontOptions() will works same way.

        * CMakeListsEfl.txt:
        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
        (WebCore::getDefaultFontOptions):

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

ChangeLog
Source/WebCore/CMakeListsEfl.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
Source/cmake/OptionsEfl.cmake

index 997779f..4a2710a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-18  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Kent Tamura.
+
+        [EFL] Remove GDK dependency.
+        https://bugs.webkit.org/show_bug.cgi?id=53978
+
+        Remove checking GDK library.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2011-02-18  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, build fix after r78981
index d9b387e..a0b7444 100644 (file)
@@ -229,11 +229,9 @@ ENDIF ()
 
 IF (ENABLE_GLIB_SUPPORT)
   LIST(APPEND WebCore_LIBRARIES
-    ${GDK_LIBRARIES}
     ${Glib_LIBRARIES}
   )
   LIST(APPEND WebCore_INCLUDE_DIRECTORIES
-    ${GDK_INCLUDE_DIRS}
     ${Glib_INCLUDE_DIRS}
   )
 ENDIF ()
index b394246..cca3b05 100644 (file)
@@ -1,3 +1,17 @@
+2011-02-18  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Kent Tamura.
+
+        [EFL] Remove GDK dependency.
+        https://bugs.webkit.org/show_bug.cgi?id=53978
+
+        Remove GLIB_SUPPORT macro in GDK related code.
+        Regardless of GLIB_SUPPORT, getDefaultFontOptions() will works same way.
+
+        * CMakeListsEfl.txt:
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        (WebCore::getDefaultFontOptions):
+
 2011-02-18  Noel Gordon  <noel.gordon@gmail.com>
 
         Reviewed by James Robinson.
index 7340e76..d2616c8 100644 (file)
@@ -31,7 +31,7 @@
 #include <cairo.h>
 #include <fontconfig/fcfreetype.h>
 
-#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
+#if !PLATFORM(EFL)
 #include <gdk/gdk.h>
 #endif
 
@@ -103,7 +103,7 @@ void setCairoFontOptionsFromFontConfigPattern(cairo_font_options_t* options, FcP
 static const cairo_font_options_t* getDefaultFontOptions()
 {
     static const cairo_font_options_t* options = cairo_font_options_create();
-#if PLATFORM(GTK) || ENABLE(GLIB_SUPPORT)
+#if PLATFORM(GTK)
     if (GdkScreen* screen = gdk_screen_get_default()) {
         const cairo_font_options_t* screenOptions = gdk_screen_get_font_options(screen);
         if (screenOptions)
index da9fe6c..d02aef0 100644 (file)
@@ -144,7 +144,6 @@ IF (ENABLE_VIDEO)
 ENDIF()
 
 IF (ENABLE_GLIB_SUPPORT)
-  FIND_PACKAGE(GDK 2.10 REQUIRED)
   FIND_PACKAGE(Glib REQUIRED)
   FIND_PACKAGE(Gthread REQUIRED)
 ENDIF ()