Changeset 157920 in webkit


Ignore:
Timestamp:
Oct 24, 2013 3:01:02 AM (11 years ago)
Author:
ryuan.choi@samsung.com
Message:

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

Reviewed by Gyuyoung Kim.

After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
Eo typedef and splitted header files which contain version macro.

.:

  • Source/cmake/EFLHelpers.cmake: Checked whether include path exist.
  • Source/cmake/FindEcore.cmake: Added 1.8 Header which have version macro.
  • Source/cmake/FindEdje.cmake: Ditto.
  • Source/cmake/FindEina.cmake: Ditto.
  • Source/cmake/FindEo.cmake: Ditto.
  • Source/cmake/FindEvas.cmake: Ditto.

Source/JavaScriptCore:

  • PlatformEfl.cmake: Added EO path to include directories.
  • heap/HeapTimer.h: Changed Ecore_Timer typedef when EO exist.

Source/WebCore:

  • platform/Widget.h: Changed Eo typedef.
  • platform/efl/EflScreenUtilities.h: Ditto.
  • platform/graphics/Image.h: Ditto.

Source/WTF:

  • wtf/OwnPtrCommon.h: Changed Eo typedef.
  • wtf/efl/RefPtrEfl.h: Ditto.

Tools:

  • TestWebKitAPI/PlatformWebView.h: Changed Eo typedef.
  • WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
  • WebKitTestRunner/PlatformWebView.h: Ditto.
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r157847 r157920  
     12013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL 1.8 libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=123245
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
     9        Eo typedef and splitted header files which contain version macro.
     10
     11        * Source/cmake/EFLHelpers.cmake: Checked whether include path exist.
     12        * Source/cmake/FindEcore.cmake: Added 1.8 Header which have version macro.
     13        * Source/cmake/FindEdje.cmake: Ditto.
     14        * Source/cmake/FindEina.cmake: Ditto.
     15        * Source/cmake/FindEo.cmake: Ditto.
     16        * Source/cmake/FindEvas.cmake: Ditto.
     17
    1182013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
    219

  • trunk/Source/JavaScriptCore/ChangeLog

    r157883 r157920  
     12013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL 1.8 libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=123245
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
     9        Eo typedef and splitted header files which contain version macro.
     10
     11        * PlatformEfl.cmake: Added EO path to include directories.
     12        * heap/HeapTimer.h: Changed Ecore_Timer typedef when EO exist.
     13
    1142013-10-23  Filip Pizlo  <fpizlo@apple.com>
    215

  • trunk/Source/JavaScriptCore/PlatformEfl.cmake

    r151149 r157920  
    22    ${ECORE_INCLUDE_DIRS}
    33    ${EINA_INCLUDE_DIRS}
     4    ${EO_INCLUDE_DIRS}
    45)

  • trunk/Source/JavaScriptCore/heap/HeapTimer.h

    r157654 r157920  
    3535#include <BlackBerryPlatformTimer.h>
    3636#elif PLATFORM(EFL)
     37#if USE(EO)
     38typedef struct _Eo_Opaque Ecore_Timer;
     39#else
    3740typedef struct _Ecore_Timer Ecore_Timer;
     41#endif
    3842#endif
    3943

  • trunk/Source/WTF/ChangeLog

    r157918 r157920  
     12013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL 1.8 libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=123245
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
     9        Eo typedef and splitted header files which contain version macro.
     10
     11        * wtf/OwnPtrCommon.h: Changed Eo typedef.
     12        * wtf/efl/RefPtrEfl.h: Ditto.
     13
    1142013-10-24  Carlos Garcia Campos  <cgarcia@igalia.com>
    215

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

    r155476 r157920  
    3636typedef struct _Eina_Module Eina_Module;
    3737#if USE(EO)
    38 typedef struct _Eo Evas_Object;
     38typedef struct _Eo_Opaque Evas_Object;
    3939#else
    4040typedef struct _Evas_Object Evas_Object;

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

    r138326 r157920  
    2424
    2525#if USE(EO)
    26 typedef struct _Eo Evas_Object;
     26typedef struct _Eo_Opaque Evas_Object;
    2727#else
    2828typedef struct _Evas_Object Evas_Object;

  • trunk/Source/WebCore/ChangeLog

    r157919 r157920  
     12013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL 1.8 libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=123245
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
     9        Eo typedef and splitted header files which contain version macro.
     10
     11        * platform/Widget.h: Changed Eo typedef.
     12        * platform/efl/EflScreenUtilities.h: Ditto.
     13        * platform/graphics/Image.h: Ditto.
     14
    1152013-10-24  Andreas Kling  <akling@apple.com>
    216

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

    r156921 r157920  
    6060#if PLATFORM(EFL)
    6161#if USE(EO)
    62 typedef struct _Eo Evas_Object;
     62typedef struct _Eo_Opaque Evas_Object;
    6363#else
    6464typedef struct _Evas_Object Evas_Object;

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

    r152523 r157920  
    2323
    2424#if USE(EO)
    25 typedef struct _Eo Evas;
     25typedef struct _Eo_Opaque Evas;
    2626#else
    2727typedef struct _Evas Evas;

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

    r157909 r157920  
    6161#if PLATFORM(EFL)
    6262#if USE(EO)
    63 typedef struct _Eo Evas;
    64 typedef struct _Eo Evas_Object;
     63typedef struct _Eo_Opaque Evas;
     64typedef struct _Eo_Opaque Evas_Object;
    6565#else
    6666typedef struct _Evas Evas;

  • trunk/Source/cmake/EFLHelpers.cmake

    r136790 r157920  
    4646    foreach (_current_header ${PARAM_HEADERS})
    4747        find_path(${_current_header}_INCLUDE_DIR NAMES ${_current_header} PATH_SUFFIXES ${PARAM_HEADER_PREFIXES})
    48         list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
    4948
    50         if (NOT _version_found)
    51             set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
    52             if (EXISTS ${_header_path})
     49        set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
     50        if (EXISTS ${_header_path})
     51            list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
     52
     53            if (NOT _version_found)
    5354                file(READ "${_header_path}" _header_contents)
    5455

  • trunk/Source/cmake/FindEcore.cmake

    r144842 r157920  
    4242
    4343FIND_EFL_LIBRARY(ECORE
    44     HEADERS Ecore.h
     44    HEADERS Ecore.h Ecore_Common.h
    4545    HEADER_PREFIXES ecore-1
    4646    LIBRARY ecore

  • trunk/Source/cmake/FindEdje.cmake

    r136790 r157920  
    3333
    3434FIND_EFL_LIBRARY(EDJE
    35     HEADERS Edje.h
     35    HEADERS Edje.h Edje_Common.h
    3636    HEADER_PREFIXES edje-1
    3737    LIBRARY edje

  • trunk/Source/cmake/FindEina.cmake

    r136790 r157920  
    3232
    3333FIND_EFL_LIBRARY(EINA
    34     HEADERS Eina.h eina_main.h
     34    HEADERS Eina.h Eina_Common.h eina_main.h
    3535    HEADER_PREFIXES eina-1 eina-1/eina
    3636    LIBRARY eina

  • trunk/Source/cmake/FindEo.cmake

    r138326 r157920  
    3232
    3333FIND_EFL_LIBRARY(EO
    34     HEADERS Eo.h
    35     HEADER_PREFIXES eo-1
     34    HEADERS Eo.h Efl_Config.h
     35    HEADER_PREFIXES eo-1 efl-1
    3636    LIBRARY eo
    3737)

  • trunk/Source/cmake/FindEvas.cmake

    r136790 r157920  
    3232
    3333FIND_EFL_LIBRARY(EVAS
    34     HEADERS Evas.h
     34    HEADERS Evas.h Evas_Common.h
    3535    HEADER_PREFIXES evas-1
    3636    LIBRARY evas

  • trunk/Tools/ChangeLog

    r157918 r157920  
     12013-10-24  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL 1.8 libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=123245
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        After fixed build break on EFL 1.8 at r138326, EFL libraries are changed
     9        Eo typedef and splitted header files which contain version macro.
     10
     11        * TestWebKitAPI/PlatformWebView.h: Changed Eo typedef.
     12        * WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
     13        * WebKitTestRunner/PlatformWebView.h: Ditto.
     14
    1152013-10-24  Carlos Garcia Campos  <cgarcia@igalia.com>
    216

  • trunk/Tools/TestWebKitAPI/PlatformWebView.h

    r156797 r157920  
    5050typedef struct _Ecore_Evas Ecore_Evas;
    5151#if USE(EO)
    52 typedef struct _Eo Evas_Object;
     52typedef struct _Eo_Opaque Evas_Object;
    5353#else
    5454typedef struct _Evas_Object Evas_Object;

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

    r156797 r157920  
    4444#elif PLATFORM(EFL)
    4545#if USE(EO)
    46 typedef struct _Eo Ecore_Timer;
     46typedef struct _Eo_Opaque Ecore_Timer;
    4747#else
    4848typedef struct _Ecore_Timer Ecore_Timer;

  • trunk/Tools/WebKitTestRunner/PlatformWebView.h

    r156797 r157920  
    4949typedef struct _Ecore_Evas Ecore_Evas;
    5050#if USE(EO)
    51 typedef struct _Eo Evas_Object;
     51typedef struct _Eo_Opaque Evas_Object;
    5252#else
    5353typedef struct _Evas_Object Evas_Object;
Note: See TracChangeset for help on using the changeset viewer.