Changeset 64005 in webkit


Ignore:
Timestamp:
Jul 23, 2010 6:48:39 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-07-23 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Cleanup glib support (make it optional)
​https://bugs.webkit.org/show_bug.cgi?id=42480

Fixing support for compiling EFL port without glib.

  • cmake/FindGthread.cmake: Added.
  • cmake/OptionsEfl.cmake:

2010-07-23 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Cleanup glib support (make it optional)
​https://bugs.webkit.org/show_bug.cgi?id=42480

Remove gobject/GRefPtr.cpp if not using soup/glib.

  • wtf/CMakeListsEfl.txt:

2010-07-23 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Cleanup glib support (make it optional)
​https://bugs.webkit.org/show_bug.cgi?id=42480

No new tests, no new features added.
Just add flags and directories for glib if necessary.
Put some ifdefs on glib calls.

  • CMakeListsEfl.txt:
  • platform/graphics/cairo/FontPlatformDataCairo.cpp: (WebCore::FontPlatformData::FontPlatformData):

2010-07-23 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Cleanup glib support (make it optional)
​https://bugs.webkit.org/show_bug.cgi?id=42480

Just add glib flags and directories if necessary.

  • CMakeListsEfl.txt:

2010-07-23 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Cleanup glib support (make it optional)
​https://bugs.webkit.org/show_bug.cgi?id=42480

Put some ifdefs on glib calls.

  • ewk/ewk_main.cpp: (ewk_init):
Location:
trunk
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r63988 r64005  
     12010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Cleanup glib support (make it optional)
     6        https://bugs.webkit.org/show_bug.cgi?id=42480
     7
     8        Fixing support for compiling EFL port without glib.
     9
     10        * cmake/FindGthread.cmake: Added.
     11        * cmake/OptionsEfl.cmake:
     12
    1132010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
    214

  • trunk/JavaScriptCore/ChangeLog

    r63981 r64005  
     12010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Cleanup glib support (make it optional)
     6        https://bugs.webkit.org/show_bug.cgi?id=42480
     7
     8        Remove gobject/GRefPtr.cpp if not using soup/glib.
     9
     10        * wtf/CMakeListsEfl.txt:
     11
    1122010-07-23  Patrick Gansterer  <paroga@paroga.com>
    213

  • trunk/JavaScriptCore/wtf/CMakeListsEfl.txt

    r59537 r64005  
    33LIST(APPEND WTF_SOURCES
    44    efl/MainThreadEfl.cpp
    5 
    6     gobject/GOwnPtr.cpp
    7     gobject/GRefPtr.cpp
    85
    96    ThreadIdentifierDataPthreads.cpp
    … …  
    129    unicode/icu/CollatorICU.cpp
    1310)
     11
     12IF (ENABLE_GLIB_SUPPORT)
     13  LIST(APPEND WTF_SOURCES
     14    gobject/GOwnPtr.cpp
     15    gobject/GRefPtr.cpp
     16  )
     17ENDIF ()
    1418
    1519LIST(APPEND WTF_LIBRARIES

  • trunk/WebCore/CMakeListsEfl.txt

    r63988 r64005  
    126126  ${EVAS_LIBRARIES}
    127127  ${Freetype_LIBRARIES}
    128   ${GDK_LIBRARIES}
    129   ${Glib_LIBRARIES}
    130   ${GTK_LIBRARIES}
    131128  ${ICU_LIBRARIES}
    132129  ${LIBXML2_LIBRARIES}
    … …  
    154151  ${EVAS_INCLUDE_DIRS}
    155152  ${Freetype_INCLUDE_DIRS}
    156   ${GDK_INCLUDE_DIRS}
    157   ${Glib_INCLUDE_DIRS}
    158   ${GTK_INCLUDE_DIRS}
    159153  ${ICU_INCLUDE_DIRS}
    160154  ${LIBXML2_INCLUDE_DIR}
    … …  
    163157  ${SQLITE_INCLUDE_DIRS}
    164158)
     159
     160IF (ENABLE_GLIB_SUPPORT)
     161  LIST(APPEND WebCore_LIBRARIES
     162    ${GDK_LIBRARIES}
     163    ${Glib_LIBRARIES}
     164  )
     165  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     166    ${GDK_INCLUDE_DIRS}
     167    ${Glib_INCLUDE_DIRS}
     168  )
     169ENDIF ()
    165170
    166171IF (WTF_USE_SOUP)

  • trunk/WebCore/ChangeLog

    r64004 r64005  
     12010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Cleanup glib support (make it optional)
     6        https://bugs.webkit.org/show_bug.cgi?id=42480
     7
     8        No new tests, no new features added.
     9        Just add flags and directories for glib if necessary.
     10        Put some ifdefs on glib calls.
     11
     12        * CMakeListsEfl.txt:
     13        * platform/graphics/cairo/FontPlatformDataCairo.cpp:
     14        (WebCore::FontPlatformData::FontPlatformData):
     15
    1162010-07-23  James Robinson  <jamesr@chromium.org>
    217

  • trunk/WebCore/platform/efl/FileSystemEfl.cpp

    r63988 r64005  
    4343#include <errno.h>
    4444#include <fnmatch.h>
     45#if ENABLE(GLIB_SUPPORT)
    4546#include <glib.h> // TODO: remove me after following TODO is solved.
     47#endif
    4648#include <limits.h>
    4749#include <stdio.h>

  • trunk/WebCore/platform/graphics/cairo/FontPlatformDataCairo.cpp

    r57984 r64005  
    3333#include <cairo.h>
    3434#include <fontconfig/fcfreetype.h>
     35#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
    3536#include <gdk/gdk.h>
     37#endif
    3638
    3739namespace WebCore {
    … …  
    110112    cairo_matrix_init_identity(&ctm);
    111113
     114#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
    112115    if (GdkScreen* screen = gdk_screen_get_default())
    113116        options = gdk_screen_get_font_options(screen);
     117#endif
    114118
    115119    // gdk_screen_get_font_options() returns NULL if no default options are
    … …  
    150154    const cairo_font_options_t* options = NULL;
    151155
     156#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
    152157    if (GdkScreen* screen = gdk_screen_get_default())
    153158        options = gdk_screen_get_font_options(screen);
     159#endif
    154160
    155161    // gdk_screen_get_font_options() returns NULL if no default options are

  • trunk/WebKit/CMakeListsEfl.txt

    r63988 r64005  
    1616    ${EFLDEPS_INCLUDE_DIRS}
    1717    ${EVAS_INCLUDE_DIRS}
    18     ${Gdk_INCLUDE_DIRS}
    19     ${Glib_INCLUDE_DIRS}
    2018    ${LIBXML2_INCLUDE_DIRS}
    2119    ${LIBXSLT_INCLUDE_DIRS}
    … …  
    4846    ${EFLDEPS_LIBRARIES}
    4947    ${Freetype_LIBRARIES}
    50     ${Gdk_LIBRARIES}
    51     ${Glib_LIBRARIES}
    52     ${Gtk_LIBRARIES}
    5348    ${LIBXML2_LIBRARIES}
    5449    ${Pango_LIBRARIES}
    5550    ${SQLITE_LIBRARIES}
    5651)
     52
     53IF (ENABLE_GLIB_SUPPORT)
     54  LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     55    ${Gdk_INCLUDE_DIRS}
     56    ${Glib_INCLUDE_DIRS}
     57  )
     58  LIST(APPEND WebKit_LIBRARIES
     59    ${Glib_LIBRARIES}
     60    ${Gdk_LIBRARIES}
     61  )
     62ENDIF ()
    5763
    5864IF (WTF_USE_SOUP)
    … …  
    8793    ${EFLDEPS_LIBRARIES}
    8894    ${EVAS_LIBRARIES}
    89     ${Gdk_LIBRARIES}
    90     ${Glib_LIBRARIES}
    9195    ${LIBXML2_LIBRARIES}
    9296    ${LIBXSLT_LIBRARIES}
    … …  
    100104    ${EVAS_LDFLAGS}
    101105)
     106
     107IF (ENABLE_GLIB_SUPPORT)
     108  LIST(APPEND EWebLauncher_LIBRARIES
     109    ${Gdk_LIBRARIES}
     110    ${Glib_LIBRARIES}
     111    ${GTHREAD_LIBRARIES}
     112  )
     113ENDIF ()
    102114
    103115IF (WTF_USE_SOUP)

  • trunk/WebKit/ChangeLog

    r63988 r64005  
     12010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Cleanup glib support (make it optional)
     6        https://bugs.webkit.org/show_bug.cgi?id=42480
     7
     8        Just add glib flags and directories if necessary.
     9
     10        * CMakeListsEfl.txt:
     11
    1122010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
    213

  • trunk/WebKit/efl/ChangeLog

    r63988 r64005  
     12010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Cleanup glib support (make it optional)
     6        https://bugs.webkit.org/show_bug.cgi?id=42480
     7
     8        Put some ifdefs on glib calls.
     9
     10        * ewk/ewk_main.cpp:
     11        (ewk_init):
     12
    1132010-07-23  Rafael Antognolli  <antognolli@profusion.mobi>
    214

  • trunk/WebKit/efl/ewk/ewk_cookies.cpp

    r63988 r64005  
    3030#include <Eina.h>
    3131#include <eina_safety_checks.h>
     32#ifdef WTF_USE_SOUP
    3233#include <glib.h>
    33 #ifdef WTF_USE_SOUP
    3434#include <libsoup/soup.h>
    3535#endif

  • trunk/WebKit/efl/ewk/ewk_main.cpp

    r63988 r64005  
    3838#include <stdlib.h>
    3939
    40 #ifdef ENABLE_GLIB_SUPPORT
     40#if ENABLE(GLIB_SUPPORT)
    4141#include <glib-object.h>
    4242#include <glib.h>
    … …  
    9191    }
    9292
    93 #ifdef ENABLE_GLIB_SUPPORT
     93#if ENABLE(GLIB_SUPPORT)
    9494    g_type_init();
    9595

  • trunk/cmake/OptionsEfl.cmake

    r63988 r64005  
    1818FIND_PACKAGE(EFL REQUIRED)
    1919FIND_PACKAGE(Freetype 9.0 REQUIRED)
    20 FIND_PACKAGE(GDK 2.10 REQUIRED)
    21 FIND_PACKAGE(Glib REQUIRED)
    2220FIND_PACKAGE(Sqlite REQUIRED)
    2321FIND_PACKAGE(LibXml2 2.6 REQUIRED)
    … …  
    112110ENDIF ()
    113111
     112IF (ENABLE_GLIB_SUPPORT)
     113  FIND_PACKAGE(GDK 2.10 REQUIRED)
     114  FIND_PACKAGE(Glib REQUIRED)
     115  FIND_PACKAGE(Gthread REQUIRED)
     116ENDIF ()
     117
    114118SET(CPACK_SOURCE_GENERATOR TBZ2)
Note: See TracChangeset for help on using the changeset viewer.