Skip to content

W
webkit
Commit 019e0faa authored by ryuan.choi@samsung.com's avatar ryuan.choi@samsung.com
Browse files
Options

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157920 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 43307b0d
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 19 deletions
ChangeLog
View file @ 019e0faa
2013-10-24 Ryuan Choi <ryuan.choi@samsung.com>
[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.
2013-10-22 Ryuan Choi <ryuan.choi@samsung.com>
[EFL] Remove HAVE_GLX macro
......
Source/JavaScriptCore/ChangeLog
View file @ 019e0faa
2013-10-24 Ryuan Choi <ryuan.choi@samsung.com>
[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.
* PlatformEfl.cmake: Added EO path to include directories.
* heap/HeapTimer.h: Changed Ecore_Timer typedef when EO exist.
2013-10-23 Filip Pizlo <fpizlo@apple.com>
Put all uses of LLVM intrinsics behind a single Option
......
Source/JavaScriptCore/PlatformEfl.cmake
View file @ 019e0faa
list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
${ECORE_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
)
Source/JavaScriptCore/heap/HeapTimer.h
View file @ 019e0faa
......@@ -34,8 +34,12 @@
#elif PLATFORM(BLACKBERRY)
#include <BlackBerryPlatformTimer.h>
#elif PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Ecore_Timer;
#else
typedef struct _Ecore_Timer Ecore_Timer;
#endif
#endif
namespace JSC {
......
Source/WTF/ChangeLog
View file @ 019e0faa
2013-10-24 Ryuan Choi <ryuan.choi@samsung.com>
[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.
* wtf/OwnPtrCommon.h: Changed Eo typedef.
* wtf/efl/RefPtrEfl.h: Ditto.
2013-10-24 Carlos Garcia Campos <cgarcia@igalia.com>
[GObject bindings] Make EventTarget interface introspectable
......
Source/WTF/wtf/OwnPtrCommon.h
View file @ 019e0faa
......@@ -35,7 +35,7 @@ typedef struct _Ecore_Pipe Ecore_Pipe;
typedef struct _Eina_Hash Eina_Hash;
typedef struct _Eina_Module Eina_Module;
#if USE(EO)
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
......
Source/WTF/wtf/efl/RefPtrEfl.h
View file @ 019e0faa
......@@ -23,7 +23,7 @@
#include <wtf/RefPtr.h>
#if USE(EO)
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
......
Source/WebCore/ChangeLog
View file @ 019e0faa
2013-10-24 Ryuan Choi <ryuan.choi@samsung.com>
[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.
* platform/Widget.h: Changed Eo typedef.
* platform/efl/EflScreenUtilities.h: Ditto.
* platform/graphics/Image.h: Ditto.
2013-10-24 Andreas Kling <akling@apple.com>
RenderSVGResource: Pass RenderElement to fill/strokePaintingResource.
......
Source/WebCore/platform/Widget.h
View file @ 019e0faa
......@@ -59,7 +59,7 @@ typedef void* PlatformWidget;
#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
......
Source/WebCore/platform/efl/EflScreenUtilities.h
View file @ 019e0faa
......@@ -22,7 +22,7 @@
#include <wtf/text/WTFString.h>
#if USE(EO)
typedef struct _Eo Evas;
typedef struct _Eo_Opaque Evas;
#else
typedef struct _Evas Evas;
#endif
......
Source/WebCore/platform/graphics/Image.h
View file @ 019e0faa
......@@ -60,8 +60,8 @@ typedef struct _GdkPixbuf GdkPixbuf;
#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo Evas;
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas Evas;
typedef struct _Evas_Object Evas_Object;
......
Source/cmake/EFLHelpers.cmake
View file @ 019e0faa
......@@ -45,11 +45,12 @@ function(FIND_EFL_LIBRARY _name)
foreach (_current_header ${PARAM_HEADERS})
find_path(${_current_header}_INCLUDE_DIR NAMES ${_current_header} PATH_SUFFIXES ${PARAM_HEADER_PREFIXES})
list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
if (NOT _version_found)
set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
if (EXISTS ${_header_path})
set(_header_path "${${_current_header}_INCLUDE_DIR}/${_current_header}")
if (EXISTS ${_header_path})
list(APPEND ${_name}_INCLUDE_DIRS "${${_current_header}_INCLUDE_DIR}")
if (NOT _version_found)
file(READ "${_header_path}" _header_contents)
string(REGEX MATCH "#define +${_name_upper}_VERSION_MAJOR +([0-9]+)" _dummy "${_header_contents}")
......
Source/cmake/FindEcore.cmake
View file @ 019e0faa
......@@ -41,7 +41,7 @@
include(EFLHelpers)
FIND_EFL_LIBRARY(ECORE
HEADERS Ecore.h
HEADERS Ecore.h Ecore_Common.h
HEADER_PREFIXES ecore-1
LIBRARY ecore
)
......
Source/cmake/FindEdje.cmake
View file @ 019e0faa
......@@ -32,7 +32,7 @@
include(EFLHelpers)
FIND_EFL_LIBRARY(EDJE
HEADERS Edje.h
HEADERS Edje.h Edje_Common.h
HEADER_PREFIXES edje-1
LIBRARY edje
)
......
Source/cmake/FindEina.cmake
View file @ 019e0faa
......@@ -31,7 +31,7 @@
include(EFLHelpers)
FIND_EFL_LIBRARY(EINA
HEADERS Eina.h eina_main.h
HEADERS Eina.h Eina_Common.h eina_main.h
HEADER_PREFIXES eina-1 eina-1/eina
LIBRARY eina
)
......
Source/cmake/FindEo.cmake
View file @ 019e0faa
......@@ -31,8 +31,8 @@
include(EFLHelpers)
FIND_EFL_LIBRARY(EO
HEADERS Eo.h
HEADER_PREFIXES eo-1
HEADERS Eo.h Efl_Config.h
HEADER_PREFIXES eo-1 efl-1
LIBRARY eo
)
......
Source/cmake/FindEvas.cmake
View file @ 019e0faa
......@@ -31,7 +31,7 @@
include(EFLHelpers)
FIND_EFL_LIBRARY(EVAS
HEADERS Evas.h
HEADERS Evas.h Evas_Common.h
HEADER_PREFIXES evas-1
LIBRARY evas
)
......
Tools/ChangeLog
View file @ 019e0faa
2013-10-24 Ryuan Choi <ryuan.choi@samsung.com>
[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.
* TestWebKitAPI/PlatformWebView.h: Changed Eo typedef.
* WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
* WebKitTestRunner/PlatformWebView.h: Ditto.
2013-10-24 Carlos Garcia Campos <cgarcia@igalia.com>
[GObject bindings] Make EventTarget interface introspectable
......
Tools/TestWebKitAPI/PlatformWebView.h
View file @ 019e0faa
......@@ -49,7 +49,7 @@ typedef GtkWidget *PlatformWindow;
#elif PLATFORM(EFL)
typedef struct _Ecore_Evas Ecore_Evas;
#if USE(EO)
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
......
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
View file @ 019e0faa
......@@ -43,7 +43,7 @@ typedef UINT_PTR PlatformTimerRef;
typedef unsigned int PlatformTimerRef;
#elif PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo Ecore_Timer;
typedef struct _Eo_Opaque Ecore_Timer;
#else
typedef struct _Ecore_Timer Ecore_Timer;
#endif
......
Tools/WebKitTestRunner/PlatformWebView.h
View file @ 019e0faa
......@@ -48,7 +48,7 @@ typedef GtkWidget* PlatformWindow;
#elif PLATFORM(EFL)
typedef struct _Ecore_Evas Ecore_Evas;
#if USE(EO)
typedef struct _Eo Evas_Object;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment