Changeset 138326 in webkit


Ignore:
Timestamp:
Dec 20, 2012 4:59:46 PM (11 years ago)
Author:
ryuan.choi@samsung.com
Message:

[EFL] Build break with latest EFL libraries.
​https://bugs.webkit.org/show_bug.cgi?id=104827

Reviewed by Laszlo Gombos.

.:

The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.

So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.

  • Source/cmake/FindEo.cmake: Added.
  • Source/cmake/OptionsEfl.cmake:

Modified to check Eo when version of EFL libraries is 1.8.

Source/WebCore:

The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.

So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.

  • PlatformEfl.cmake: Includes eo EFL library.
  • platform/Widget.h: Modified declaration of Evas and Evas_Object.

In addition, removed unnecessary declaration.

  • platform/efl/EflScreenUtilities.h: Modified declaration of Evas.
  • platform/efl/RenderThemeEfl.h: Removed unnecessary declaration.
  • platform/graphics/Icon.h: Ditto.
  • platform/graphics/Image.h: Modified declaration of Evas and Evas_Object.

Source/WebKit:

  • PlatformEfl.cmake: Includes eo EFL library.

Source/WebKit/efl:

  • WebCoreSupport/ChromeClientEfl.h: Removed unnecessary declaration.
  • WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
  • WebCoreSupport/EditorClientEfl.h: Ditto.
  • WebCoreSupport/FrameNetworkingContextEfl.h: Ditto.
  • WebCoreSupport/PageClientEfl.h: Ditto.

Source/WebKit2:

The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.

So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.

  • PlatformEfl.cmake: Includes eo EFL library.
  • UIProcess/API/C/efl/WKAPICastEfl.h: Modified declaration of Evas_Object.
  • UIProcess/API/C/efl/WKView.h: Modified declaration of Evas.
  • UIProcess/efl/WebPopupMenuProxyEfl.h: Removed unnecessary declaration.

Source/WTF:

The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.

So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.

  • wtf/OwnPtrCommon.h: Modified declaration of Evas_Object and Ecore_Timer.
  • wtf/PlatformEfl.cmake: Includes eo EFL library.
  • wtf/efl/RefPtrEfl.h: Modified declaration of Evas_Object.

Tools:

The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.

So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.

  • DumpRenderTree/efl/CMakeLists.txt: Includes eo EFL library.
  • EWebLauncher/CMakeLists.txt: Ditto.
  • MiniBrowser/efl/CMakeLists.txt: Ditto.
  • ImageDiff/PlatformEfl.cmake: Ditto.
  • TestWebKitAPI/PlatformEfl.cmake: Ditto.
  • TestWebKitAPI/PlatformWebView.h: Modified declaration of Evas_Object.
  • WebKitTestRunner/InjectedBundle/TestRunner.h: Modified declaration of Ecore_Timer.
  • WebKitTestRunner/PlatformEfl.cmake: Includes eo EFL library.
  • WebKitTestRunner/PlatformWebView.h: Modified declaration of Evas_Object.
Location:
trunk
Files:
1 added
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r138313 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        The eo EFL package is introduced and evas and ecore use it since 1.8.
     9        While introducing Eo, EFL changed several structures of Evas and Ecore
     10        from own specific class to Eo.
     11
     12        So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
     13        Ecore_Timer to build with latest EFL libraries.
     14
     15        * Source/cmake/FindEo.cmake: Added.
     16        * Source/cmake/OptionsEfl.cmake:
     17        Modified to check Eo when version of EFL libraries is 1.8.
     18
    1192012-12-20  Kondapally Kalyan  <kalyan.kondapally@intel.com>
    220

  • trunk/Source/WTF/ChangeLog

    r138293 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        The eo EFL package is introduced and evas and ecore use it since 1.8.
     9        While introducing Eo, EFL changed several structures of Evas and Ecore
     10        from own specific class to Eo.
     11
     12        So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
     13        Ecore_Timer to build with latest EFL libraries.
     14
     15        * wtf/OwnPtrCommon.h: Modified declaration of Evas_Object and Ecore_Timer.
     16        * wtf/PlatformEfl.cmake: Includes eo EFL library.
     17        * wtf/efl/RefPtrEfl.h: Modified declaration of Evas_Object.
     18
    1192012-12-20  Oliver Hunt  <oliver@apple.com>
    220

  • trunk/Source/WTF/wtf/OwnPtrCommon.h

    r133041 r138326  
    4343typedef struct _Ecore_IMF_Context Ecore_IMF_Context;
    4444typedef struct _Ecore_Pipe Ecore_Pipe;
    45 typedef struct _Ecore_Timer Ecore_Timer;
    4645typedef struct _Eina_Hash Eina_Hash;
    4746typedef struct _Eina_Module Eina_Module;
     47#if USE(EO)
     48typedef struct _Eo Ecore_Timer;
     49typedef struct _Eo Evas_Object;
     50#else
     51typedef struct _Ecore_Timer Ecore_Timer;
    4852typedef struct _Evas_Object Evas_Object;
     53#endif
    4954#if USE(ACCELERATED_COMPOSITING)
    5055typedef struct _Evas_GL Evas_GL;

  • trunk/Source/WTF/wtf/PlatformEfl.cmake

    r136790 r138326  
    2424    ${ECORE_IMF_LIBRARIES}
    2525    ${EINA_LIBRARIES}
     26    ${EO_LIBRARIES}
    2627    ${EVAS_LIBRARIES}
    2728    ${CMAKE_DL_LIBS}
    … …  
    3233    ${ECORE_EVAS_INCLUDE_DIRS}
    3334    ${EINA_INCLUDE_DIRS}
     35    ${EO_INCLUDE_DIRS}
    3436    ${EVAS_INCLUDE_DIRS}
    3537    ${GLIB_INCLUDE_DIRS}

  • trunk/Source/WTF/wtf/efl/RefPtrEfl.h

    r128573 r138326  
    2323#include <wtf/RefPtr.h>
    2424
     25#if USE(EO)
     26typedef struct _Eo Evas_Object;
     27#else
    2528typedef struct _Evas_Object Evas_Object;
     29#endif
    2630
    2731namespace WTF {

  • trunk/Source/WebCore/ChangeLog

    r138320 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        The eo EFL package is introduced and evas and ecore use it since 1.8.
     9        While introducing Eo, EFL changed several structures of Evas and Ecore
     10        from own specific class to Eo.
     11
     12        So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
     13        Ecore_Timer to build with latest EFL libraries.
     14
     15        * PlatformEfl.cmake: Includes eo EFL library.
     16        * platform/Widget.h: Modified declaration of Evas and Evas_Object.
     17        In addition, removed unnecessary declaration.
     18        * platform/efl/EflScreenUtilities.h: Modified declaration of Evas.
     19        * platform/efl/RenderThemeEfl.h: Removed unnecessary declaration.
     20        * platform/graphics/Icon.h: Ditto.
     21        * platform/graphics/Image.h: Modified declaration of Evas and Evas_Object.
     22
    1232012-12-20  Sheriff Bot  <webkit.review.bot@gmail.com>
    224

  • trunk/Source/WebCore/PlatformEfl.cmake

    r138248 r138326  
    166166    ${ECORE_FILE_LIBRARIES}
    167167    ${ECORE_X_LIBRARIES}
     168    ${EO_LIBRARIES}
    168169    ${E_DBUS_LIBRARIES}
    169170    ${E_DBUS_EUKIT_LIBRARIES}
    … …  
    194195    ${ECORE_FILE_INCLUDE_DIRS}
    195196    ${ECORE_X_INCLUDE_DIRS}
     197    ${EO_INCLUDE_DIRS}
    196198    ${E_DBUS_INCLUDE_DIRS}
    197199    ${E_DBUS_EUKIT_INCLUDE_DIRS}

  • trunk/Source/WebCore/platform/Widget.h

    r132419 r138326  
    8080
    8181#if PLATFORM(EFL)
     82#if USE(EO)
     83typedef struct _Eo Evas_Object;
     84typedef struct _Eo Evas;
     85#else
    8286typedef struct _Evas_Object Evas_Object;
    8387typedef struct _Evas Evas;
    84 typedef struct _Ecore_Evas Ecore_Evas;
     88#endif
    8589typedef Evas_Object* PlatformWidget;
    8690#endif

  • trunk/Source/WebCore/platform/efl/EflScreenUtilities.h

    r127463 r138326  
    2222#include <wtf/text/WTFString.h>
    2323
     24#if USE(EO)
     25typedef struct _Eo Evas;
     26#else
    2427typedef struct _Evas Evas;
     28#endif
    2529
    2630namespace WebCore {

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

    r136005 r138326  
    3939#include <cairo.h>
    4040#include <wtf/efl/RefPtrEfl.h>
    41 
    42 typedef struct _Ecore_Evas Ecore_Evas;
    43 typedef struct _Evas_Object Evas_Object;
    4441
    4542namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/Icon.h

    r135842 r138326  
    3636#elif PLATFORM(GTK)
    3737typedef struct _GdkPixbuf GdkPixbuf;
    38 #elif PLATFORM(EFL)
    39 typedef struct _Evas_Object Evas_Object;
    4038#elif PLATFORM(CHROMIUM)
    4139#include "Image.h"

  • trunk/Source/WebCore/platform/graphics/Image.h

    r137011 r138326  
    6363
    6464#if PLATFORM(EFL)
     65#if USE(EO)
     66typedef struct _Eo Evas;
     67typedef struct _Eo Evas_Object;
     68#else
    6569typedef struct _Evas Evas;
    6670typedef struct _Evas_Object Evas_Object;
     71#endif
    6772#endif
    6873

  • trunk/Source/WebKit/ChangeLog

    r138065 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * PlatformEfl.cmake: Includes eo EFL library.
     9
    1102012-12-18  Joseph Pecoraro  <pecoraro@apple.com>
    211

  • trunk/Source/WebKit/PlatformEfl.cmake

    r136790 r138326  
    1818    ${EFREET_INCLUDE_DIRS}
    1919    ${EINA_INCLUDE_DIRS}
     20    ${EO_INCLUDE_DIRS}
    2021    ${EVAS_INCLUDE_DIRS}
    2122    ${GLIB_INCLUDE_DIRS}
    … …  
    150151    ${ECORE_INPUT_LIBRARIES}
    151152    ${EFREET_LIBRARIES}
     153    ${EO_LIBRARIES}
    152154    ${EVAS_LIBRARIES}
    153155    ${FREETYPE_LIBRARIES}

  • trunk/Source/WebKit/efl/ChangeLog

    r138110 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * WebCoreSupport/ChromeClientEfl.h: Removed unnecessary declaration.
     9        * WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
     10        * WebCoreSupport/EditorClientEfl.h: Ditto.
     11        * WebCoreSupport/FrameNetworkingContextEfl.h: Ditto.
     12        * WebCoreSupport/PageClientEfl.h: Ditto.
     13
    1142012-12-18  Alexey Proskuryakov  <ap@apple.com>
    215

  • trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

    r137318 r138326  
    3636#include "NotificationClient.h"
    3737#endif
    38 
    39 typedef struct _Evas_Object Evas_Object;
    4038
    4139namespace WebCore {

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h

    r134059 r138326  
    3131#include <wtf/text/WTFString.h>
    3232
    33 typedef struct _Evas_Object Evas_Object;
    3433typedef struct _Ewk_History_Item Ewk_History_Item;
    3534typedef struct _Ewk_Intent Ewk_Intent;

  • trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h

    r122563 r138326  
    4141#include <wtf/Deque.h>
    4242#include <wtf/Forward.h>
    43 
    44 typedef struct _Evas_Object Evas_Object;
    4543
    4644struct Ewk_Should_Insert_Node_Event {

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h

    r130259 r138326  
    3232#include "FrameNetworkingContext.h"
    3333
    34 typedef struct _Evas_Object Evas_Object;
    35 
    3634namespace WebCore {
    3735

  • trunk/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h

    r122563 r138326  
    2424
    2525typedef struct _Evas_Native_Surface Evas_Native_Surface;
    26 typedef struct _Evas_Object Evas_Object;
    2726
    2827namespace WebCore {

  • trunk/Source/WebKit2/ChangeLog

    r138324 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        The eo EFL package is introduced and evas and ecore use it since 1.8.
     9        While introducing Eo, EFL changed several structures of Evas and Ecore
     10        from own specific class to Eo.
     11
     12        So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
     13        Ecore_Timer to build with latest EFL libraries.
     14
     15        * PlatformEfl.cmake: Includes eo EFL library.
     16        * UIProcess/API/C/efl/WKAPICastEfl.h: Modified declaration of Evas_Object.
     17        * UIProcess/API/C/efl/WKView.h: Modified declaration of Evas.
     18        * UIProcess/efl/WebPopupMenuProxyEfl.h: Removed unnecessary declaration.
     19
    1202012-12-20  Helder Correia  <helder.correia@nokia.com>
    221

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r137969 r138326  
    182182    ${EFREET_INCLUDE_DIRS}
    183183    ${EINA_INCLUDE_DIRS}
     184    ${EO_INCLUDE_DIRS}
    184185    ${EVAS_INCLUDE_DIRS}
    185186    ${HARFBUZZ_INCLUDE_DIRS}
    … …  
    206207    ${EFREET_LIBRARIES}
    207208    ${EINA_LIBRARIES}
     209    ${EO_LIBRARIES}
    208210    ${EVAS_LIBRARIES}
    209211    ${Freetype_LIBRARIES}

  • trunk/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h

    r120925 r138326  
    2525#endif
    2626
     27#if USE(EO)
     28typedef struct _Eo Evas_Object;
     29#else
    2730typedef struct _Evas_Object Evas_Object;
     31#endif
    2832
    2933namespace WebKit {

  • trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.h

    r135935 r138326  
    2323#include <WebKit2/WKBase.h>
    2424
     25#if USE(EO)
     26typedef struct _Eo Evas;
     27#else
    2528typedef struct _Evas Evas;
     29#endif
    2630
    2731#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h

    r132463 r138326  
    2828
    2929#include "WebPopupMenuProxy.h"
    30 
    31 typedef struct _Evas_Object Evas_Object;
    3230
    3331namespace WebCore {

  • trunk/Source/cmake/OptionsEfl.cmake

    r138313 r138326  
    124124find_package(E_DBus 1.6 COMPONENTS EUKit)
    125125
     126# Add Eo dependency if EFL version is 1.8
     127if (${EVAS_VERSION} VERSION_EQUAL 1.8 AND ${ECORE_VERSION} VERSION_EQUAL 1.8)
     128    find_package(Eo)
     129    add_definitions(-DWTF_USE_EO=1)
     130endif ()
     131
    126132# Prefer and promote EFL version 1.7+ as the reference configuration
    127133if ((${EINA_VERSION} STRLESS 1.7) OR (${EVAS_VERSION} STRLESS 1.7) OR (${ECORE_VERSION} STRLESS 1.7) OR (${EDJE_VERSION} STRLESS 1.7) OR

  • trunk/Tools/ChangeLog

    r138314 r138326  
     12012-12-20  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=104827
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        The eo EFL package is introduced and evas and ecore use it since 1.8.
     9        While introducing Eo, EFL changed several structures of Evas and Ecore
     10        from own specific class to Eo.
     11
     12        So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
     13        Ecore_Timer to build with latest EFL libraries.
     14
     15        * DumpRenderTree/efl/CMakeLists.txt: Includes eo EFL library.
     16        * EWebLauncher/CMakeLists.txt: Ditto.
     17        * MiniBrowser/efl/CMakeLists.txt: Ditto.
     18        * ImageDiff/PlatformEfl.cmake: Ditto.
     19        * TestWebKitAPI/PlatformEfl.cmake: Ditto.
     20        * TestWebKitAPI/PlatformWebView.h: Modified declaration of Evas_Object.
     21        * WebKitTestRunner/InjectedBundle/TestRunner.h: Modified declaration of Ecore_Timer.
     22        * WebKitTestRunner/PlatformEfl.cmake: Includes eo EFL library.
     23        * WebKitTestRunner/PlatformWebView.h: Modified declaration of Evas_Object.
     24
    1252012-12-20  Dirk Pranke  <dpranke@chromium.org>
    226

  • trunk/Tools/DumpRenderTree/efl/CMakeLists.txt

    r138019 r138326  
    3535    ${EDJE_LIBRARIES}
    3636    ${EINA_LIBRARIES}
     37    ${EO_LIBRARIES}
    3738    ${EVAS_LIBRARIES}
    3839    ${FONTCONFIG_LIBRARIES}
    … …  
    104105    ${EDJE_INCLUDE_DIRS}
    105106    ${EINA_INCLUDE_DIRS}
     107    ${EO_INCLUDE_DIRS}
    106108    ${EVAS_INCLUDE_DIRS}
    107109    ${FONTCONFIG_INCLUDE_DIR}

  • trunk/Tools/EWebLauncher/CMakeLists.txt

    r136790 r138326  
    1616    ${EDJE_LIBRARIES}
    1717    ${EINA_LIBRARIES}
     18    ${EO_LIBRARIES}
    1819    ${EVAS_LIBRARIES}
    1920    ${LIBXML2_LIBRARIES}
    … …  
    3334    ${EDJE_INCLUDE_DIRS}
    3435    ${EINA_INCLUDE_DIRS}
     36    ${EO_INCLUDE_DIRS}
    3537    ${EVAS_INCLUDE_DIRS}
    3638    ${GLIB_INCLUDE_DIRS}

  • trunk/Tools/ImageDiff/PlatformEfl.cmake

    r138158 r138326  
    77    ${ECORE_INCLUDE_DIRS}
    88    ${EINA_INCLUDE_DIRS}
     9    ${EO_INCLUDE_DIRS}
    910    ${EVAS_INCLUDE_DIRS}
    1011)
    … …  
    1415    ${ECORE_LIBRARIES}
    1516    ${EINA_LIBRARIES}
     17    ${EO_LIBRARIES}
    1618    ${EVAS_LIBRARIES}
    1719)

  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r137279 r138326  
    1616    ${EDJE_INCLUDE_DIRS}
    1717    ${EET_INCLUDE_DIRS}
     18    ${EO_INCLUDE_DIRS}
    1819    ${DBUS_INCLUDE_DIRS}
    1920    ${E_DBUS_INCLUDE_DIRS}
    … …  
    3940    ${EINA_LIBRARIES}
    4041    ${ELEMENTARY_LIBRARIES}
     42    ${EO_LIBRARIES}
    4143    ${EVAS_LIBRARIES}
    4244    ${FONTCONFIG_LIBRARIES}

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r138007 r138326  
    1717    ${ECORE_INCLUDE_DIRS}
    1818    ${EINA_INCLUDE_DIRS}
     19    ${EO_INCLUDE_DIRS}
    1920    ${EVAS_INCLUDE_DIRS}
    2021    ${GLIB_INCLUDE_DIRS}

  • trunk/Tools/TestWebKitAPI/PlatformWebView.h

    r122973 r138326  
    4848typedef GtkWidget *PlatformWindow;
    4949#elif PLATFORM(EFL)
     50#if USE(EO)
     51typedef struct _Eo Evas_Object;
     52#else
    5053typedef struct _Evas_Object Evas_Object;
     54#endif
    5155typedef struct _Ecore_Evas Ecore_Evas;
    5256typedef Evas_Object* PlatformWKView;

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r138232 r138326  
    4646typedef unsigned int PlatformTimerRef;
    4747#elif PLATFORM(EFL)
     48#if USE(EO)
     49typedef struct _Eo Ecore_Timer;
     50#else
    4851typedef struct _Ecore_Timer Ecore_Timer;
     52#endif
    4953typedef Ecore_Timer* PlatformTimerRef;
    5054#endif

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r137475 r138326  
    2626    ${ECORE_EVAS_INCLUDE_DIRS}
    2727    ${EINA_INCLUDE_DIRS}
     28    ${EO_INCLUDE_DIRS}
    2829    ${EVAS_INCLUDE_DIRS}
    2930    ${GLIB_INCLUDE_DIRS}
    … …  
    3536    ${ECORE_EVAS_LIBRARIES}
    3637    ${EINA_LIBRARIES}
     38    ${EO_LIBRARIES}
    3739    ${EVAS_LIBRARIES}
    3840    ${GLIB_LIBRARIES}

  • trunk/Tools/WebKitTestRunner/PlatformWebView.h

    r135302 r138326  
    5555typedef GtkWidget* PlatformWindow;
    5656#elif PLATFORM(EFL)
     57#if USE(EO)
     58typedef struct _Eo Evas_Object;
     59#else
    5760typedef struct _Evas_Object Evas_Object;
     61#endif
    5862typedef struct _Ecore_Evas Ecore_Evas;
    5963typedef Evas_Object* PlatformWKView;
Note: See TracChangeset for help on using the changeset viewer.