Attachment #227533 for bug #130511

View Details Raw Unified Return to Bug 130511

| Differences between



2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!)

        Move all EFL typedefs into GTypedefs.h.

        * heap/HeapTimer.h: Remove EFL typedefs.

2014-03-20  Filip Pizlo  <fpizlo@apple.com>

        FTL should correctly compile GetByVal on Uint32Array that claims to return non-int32 values



2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!).

        Move all EFL typedefs into GTypedefs.h.

        * wtf/efl/RefPtrEfl.h: Remove EFL typedefs.
        * wtf/gobject/GTypedefs.h: Add All Efl typedefs.

2014-03-20  Darin Adler  <darin@apple.com>

        Fix a header guard mistake (harmless but clearly wrong)



2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!).

        Move all EFL typedefs into GTypedefs.h.

        * platform/FileSystem.h:
        * platform/Widget.h:
        * platform/efl/EflScreenUtilities.h:
        * platform/graphics/Icon.h:
        * platform/graphics/Image.h:
        * platform/graphics/IntPoint.h:
        * platform/graphics/IntRect.h:
        * platform/network/NetworkStateNotifier.h:

2014-03-21  Pratik Solanki  <psolanki@apple.com>

        Unreviewed. iOS build fix after r166046.



2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!).

        Move all EFL typedefs into GTypedefs.h.

        * WebCoreSupport/BatteryClientEfl.h: Remove EFL typedefs.
        * WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
        * WebCoreSupport/EditorClientEfl.h: Ditto.
        * WebCoreSupport/FrameNetworkingContextEfl.h: Ditto.
        * WebCoreSupport/NavigatorContentUtilsClientEfl.h: Ditto.
        * WebCoreSupport/ProgressTrackerClientEfl.h: Ditto.

2014-03-20  Hyowon Kim  <hw1008.kim@samsung.com>

        Move to using std::unique_ptr for EFL objects.



2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!).

        Move all EFL typedefs into GTypedefs.h.

        * Shared/API/c/efl/WKArrayEfl.h: Remove EFL typedefs.
        * UIProcess/API/efl/EwkView.h: Ditto.

2014-03-21  Ryuan Choi  <ryuan.choi@samsung.com>

        [EFL][WK2] Remove Ewk_Error parameter from some async callbacks




#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#elif PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Ecore_Timer;
#else
typedef struct _Ecore_Timer Ecore_Timer;
#endif
#endif

namespace JSC {




#include <wtf/RefPtr.h>

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

namespace WTF {

template<> void refIfNotNull(Evas_Object* ptr);




#endif

#if PLATFORM(EFL)
typedef unsigned char Eina_Bool;
typedef struct _Evas_Point Evas_Point;
typedef struct _Evas_GL Evas_GL;
typedef struct _Evas_GL_Context Evas_GL_Context;
typedef struct _Evas_GL_Surface Evas_GL_Surface;
typedef struct _Ecore_Evas Ecore_Evas;
typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
typedef struct _Eina_List Eina_List;
typedef struct _Eina_Module Eina_Module;
typedef struct _Eina_Rectangle Eina_Rectangle;
#if USE(EO)
typedef struct _Eo_Opaque Evas;
typedef struct _Eo_Opaque Evas_Object;
typedef struct _Eo_Opaque Ecore_Timer;
#else
typedef struct _Evas Evas;
typedef struct _Evas_Object Evas_Object;
typedef struct _Ecore_Timer Ecore_Timer;
#endif
#endif

#endif
#endif /* GtkTypedefs_h */



typedef struct _GModule GModule;
#endif

#if PLATFORM(EFL)
typedef struct _Eina_Module Eina_Module;
#endif

namespace WebCore {

// PlatformModule



#endif

#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
typedef Evas_Object* PlatformWidget;
#endif





#include <wtf/text/WTFString.h>

#if USE(EO)
typedef struct _Eo_Opaque Evas;
#else
typedef struct _Evas Evas;
typedef struct _Ecore_Evas Ecore_Evas;
#endif

namespace WebCore {

void applyFallbackCursor(Ecore_Evas*, const char*);



typedef struct HICON__* HICON;
#elif PLATFORM(GTK)
typedef struct _GdkPixbuf GdkPixbuf;
#elif PLATFORM(EFL)
typedef struct _Evas_Object Evas_Object;
#endif

namespace WebCore {



typedef struct _GdkPixbuf GdkPixbuf;
#endif

#if PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Evas;
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas Evas;
typedef struct _Evas_Object Evas_Object;
#endif
#endif

namespace WebCore {

class AffineTransform;



typedef struct tagPOINTS POINTS;
#elif PLATFORM(GTK)
typedef struct _GdkPoint GdkPoint;
#elif PLATFORM(EFL)
typedef struct _Evas_Point Evas_Point;
#endif

namespace WebCore {



#ifdef GTK_API_VERSION_2
typedef struct _GdkRectangle GdkRectangle;
#endif
#elif PLATFORM(EFL)
typedef struct _Eina_Rectangle Eina_Rectangle;
#endif

#if USE(CAIRO)




#include <windows.h>

#elif PLATFORM(EFL)

typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
typedef unsigned char Eina_Bool;

#elif PLATFORM(IOS)

#include <wtf/RetainPtr.h>



#include "BatteryStatus.h"
#include <wtf/PassRefPtr.h>

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

namespace WebCore {
class BatteryController;
}



#include <atk/atk.h>
#endif

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

typedef struct _Ewk_History_Item Ewk_History_Item;

typedef Vector<Ewk_History_Item*> HistoryItemChildrenVector;



#include <wtf/Forward.h>
#include <wtf/text/StringView.h>

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

struct Ewk_Should_Insert_Node_Event {
    WebCore::Node* node;
    WebCore::Range* range;




#include "FrameNetworkingContext.h"

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

namespace WebCore {

class FrameNetworkingContextEfl : public WebCore::FrameNetworkingContext {




#include <wtf/PassOwnPtr.h>

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

namespace WebCore {
class NavigatorContentUtilsClientEfl : public WebCore::NavigatorContentUtilsClient {
public:




#include "ProgressTrackerClient.h"

#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif

namespace WebCore {

class ProgressTrackerClientEfl final : public WebCore::ProgressTrackerClient {




#include <WebKit2/WKBase.h>

/**
 * @typedef Eina_List
 * Type for a generic double linked list.
 */
typedef struct _Eina_List Eina_List;

WK_EXPORT WKArrayRef WKArrayCreateWithEinaList(Eina_List*, WKTypeRef (*createWKType)(void*));

#endif // WKArrayEfl_h



class EwkSettings;
class EwkWindowFeatures;

typedef struct _Evas_GL_Context Evas_GL_Context;
typedef struct _Evas_GL_Surface Evas_GL_Surface;

typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;
typedef struct Ewk_View_Smart_Class Ewk_View_Smart_Class;




2014-03-21  Hyowon Kim  <hw1008.kim@samsung.com>

        Clean up EFL typedefs.
        https://bugs.webkit.org/show_bug.cgi?id=130511

        Reviewed by NOBODY (OOPS!).

        Move all EFL typedefs into GTypedefs.h.

        * TestWebKitAPI/PlatformWebView.h: Remove EFL typedefs.
        * WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
        * WebKitTestRunner/PlatformWebView.h: Ditto.

2014-03-21  Andreas Kling  <akling@apple.com>

        RetainPtr API test should use CFArray instead of CFString for testing.



typedef WKViewRef PlatformWKView;
typedef GtkWidget *PlatformWindow;
#elif PLATFORM(EFL)
typedef struct _Ecore_Evas Ecore_Evas;
#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
typedef Evas_Object* PlatformWKView;
typedef Ecore_Evas* PlatformWindow;
#endif



#elif PLATFORM(GTK)
typedef unsigned int PlatformTimerRef;
#elif PLATFORM(EFL)
#if USE(EO)
typedef struct _Eo_Opaque Ecore_Timer;
#else
typedef struct _Ecore_Timer Ecore_Timer;
#endif
typedef Ecore_Timer* PlatformTimerRef;
#endif




typedef WKViewRef PlatformWKView;
typedef GtkWidget* PlatformWindow;
#elif PLATFORM(EFL)
typedef struct _Ecore_Evas Ecore_Evas;
#if USE(EO)
typedef struct _Eo_Opaque Evas_Object;
#else
typedef struct _Evas_Object Evas_Object;
#endif
typedef Evas_Object* PlatformWKView;
typedef Ecore_Evas* PlatformWindow;
#endif

Return to Bug 130511

Lines 105-109 typedef struct _GtkStyleContext GtkStyleContext; a/Source/WTF/wtf/gobject/GTypedefs.h_sec1
- a/Source/WTF/wtf/gobject/GTypedefs.h +22 lines
105		105
106	#endif	106	#endif
107		107
		108	#if PLATFORM(EFL)
		109	typedef unsigned char Eina_Bool;
		110	typedef struct _Evas_Point Evas_Point;
		111	typedef struct _Evas_GL Evas_GL;
		112	typedef struct _Evas_GL_Context Evas_GL_Context;
		113	typedef struct _Evas_GL_Surface Evas_GL_Surface;
		114	typedef struct _Ecore_Evas Ecore_Evas;
		115	typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
		116	typedef struct _Eina_List Eina_List;
		117	typedef struct _Eina_Module Eina_Module;
		118	typedef struct _Eina_Rectangle Eina_Rectangle;
		119	#if USE(EO)
		120	typedef struct _Eo_Opaque Evas;
		121	typedef struct _Eo_Opaque Evas_Object;
		122	typedef struct _Eo_Opaque Ecore_Timer;
		123	#else
		124	typedef struct _Evas Evas;
		125	typedef struct _Evas_Object Evas_Object;
		126	typedef struct _Ecore_Timer Ecore_Timer;
		127	#endif
		128	#endif
		129
108	#endif	130	#endif
109	#endif /* GtkTypedefs_h */	131	#endif /* GtkTypedefs_h */

Lines 58-67 typedef struct _GFileIOStream GFileIOStream; a/Source/WebCore/platform/FileSystem.h_sec1
- a/Source/WebCore/platform/FileSystem.h -4 lines
58	typedef struct _GModule GModule;	58	typedef struct _GModule GModule;
59	#endif	59	#endif
60		60
61	#if PLATFORM(EFL)
62	typedef struct _Eina_Module Eina_Module;
63	#endif
64
65	namespace WebCore {	61	namespace WebCore {
66		62
67	// PlatformModule	63	// PlatformModule

Lines 37-44 OBJC_CLASS NSImage; a/Source/WebCore/platform/graphics/Icon.h_sec1
- a/Source/WebCore/platform/graphics/Icon.h -2 lines
37	typedef struct HICON__* HICON;	37	typedef struct HICON__* HICON;
38	#elif PLATFORM(GTK)	38	#elif PLATFORM(GTK)
39	typedef struct _GdkPixbuf GdkPixbuf;	39	typedef struct _GdkPixbuf GdkPixbuf;
40	#elif PLATFORM(EFL)
41	typedef struct _Evas_Object Evas_Object;
42	#endif	40	#endif
43		41
44	namespace WebCore {	42	namespace WebCore {

Lines 58-73 typedef struct HBITMAP__ *HBITMAP; a/Source/WebCore/platform/graphics/Image.h_sec1
- a/Source/WebCore/platform/graphics/Image.h -10 lines
58	typedef struct _GdkPixbuf GdkPixbuf;	58	typedef struct _GdkPixbuf GdkPixbuf;
59	#endif	59	#endif
60		60
61	#if PLATFORM(EFL)
62	#if USE(EO)
63	typedef struct _Eo_Opaque Evas;
64	typedef struct _Eo_Opaque Evas_Object;
65	#else
66	typedef struct _Evas Evas;
67	typedef struct _Evas_Object Evas_Object;
68	#endif
69	#endif
70
71	namespace WebCore {	61	namespace WebCore {
72		62
73	class AffineTransform;	63	class AffineTransform;

Lines 54-61 typedef struct tagRECT RECT; a/Source/WebCore/platform/graphics/IntRect.h_sec1
- a/Source/WebCore/platform/graphics/IntRect.h -2 lines
54	#ifdef GTK_API_VERSION_2	54	#ifdef GTK_API_VERSION_2
55	typedef struct _GdkRectangle GdkRectangle;	55	typedef struct _GdkRectangle GdkRectangle;
56	#endif	56	#endif
57	#elif PLATFORM(EFL)
58	typedef struct _Eina_Rectangle Eina_Rectangle;
59	#endif	57	#endif
60		58
61	#if USE(CAIRO)	59	#if USE(CAIRO)

Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
- a/Source/JavaScriptCore/ChangeLog +11 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!)
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* heap/HeapTimer.h: Remove EFL typedefs.
		11
1	2014-03-20 Filip Pizlo <fpizlo@apple.com>	12	2014-03-20 Filip Pizlo <fpizlo@apple.com>
2		13
3	FTL should correctly compile GetByVal on Uint32Array that claims to return non-int32 values	14	FTL should correctly compile GetByVal on Uint32Array that claims to return non-int32 values

Lines 1-3 a/Source/WTF/ChangeLog_sec1
- a/Source/WTF/ChangeLog +12 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* wtf/efl/RefPtrEfl.h: Remove EFL typedefs.
		11	* wtf/gobject/GTypedefs.h: Add All Efl typedefs.
		12
1	2014-03-20 Darin Adler <darin@apple.com>	13	2014-03-20 Darin Adler <darin@apple.com>
2		14
3	Fix a header guard mistake (harmless but clearly wrong)	15	Fix a header guard mistake (harmless but clearly wrong)

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +18 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* platform/FileSystem.h:
		11	* platform/Widget.h:
		12	* platform/efl/EflScreenUtilities.h:
		13	* platform/graphics/Icon.h:
		14	* platform/graphics/Image.h:
		15	* platform/graphics/IntPoint.h:
		16	* platform/graphics/IntRect.h:
		17	* platform/network/NetworkStateNotifier.h:
		18
1	2014-03-21 Pratik Solanki <psolanki@apple.com>	19	2014-03-21 Pratik Solanki <psolanki@apple.com>
2		20
3	Unreviewed. iOS build fix after r166046.	21	Unreviewed. iOS build fix after r166046.

Lines 1-3 a/Source/WebKit/efl/ChangeLog_sec1
- a/Source/WebKit/efl/ChangeLog +16 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* WebCoreSupport/BatteryClientEfl.h: Remove EFL typedefs.
		11	* WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
		12	* WebCoreSupport/EditorClientEfl.h: Ditto.
		13	* WebCoreSupport/FrameNetworkingContextEfl.h: Ditto.
		14	* WebCoreSupport/NavigatorContentUtilsClientEfl.h: Ditto.
		15	* WebCoreSupport/ProgressTrackerClientEfl.h: Ditto.
		16
1	2014-03-20 Hyowon Kim <hw1008.kim@samsung.com>	17	2014-03-20 Hyowon Kim <hw1008.kim@samsung.com>
2		18
3	Move to using std::unique_ptr for EFL objects.	19	Move to using std::unique_ptr for EFL objects.

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +12 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* Shared/API/c/efl/WKArrayEfl.h: Remove EFL typedefs.
		11	* UIProcess/API/efl/EwkView.h: Ditto.
		12
1	2014-03-21 Ryuan Choi <ryuan.choi@samsung.com>	13	2014-03-21 Ryuan Choi <ryuan.choi@samsung.com>
2		14
3	[EFL][WK2] Remove Ewk_Error parameter from some async callbacks	15	[EFL][WK2] Remove Ewk_Error parameter from some async callbacks

Lines 31-42 a/Source/JavaScriptCore/heap/HeapTimer.h_sec1
- a/Source/JavaScriptCore/heap/HeapTimer.h -6 lines
31		31
32	#if USE(CF)	32	#if USE(CF)
33	#include <CoreFoundation/CoreFoundation.h>	33	#include <CoreFoundation/CoreFoundation.h>
34	#elif PLATFORM(EFL)
35	#if USE(EO)
36	typedef struct _Eo_Opaque Ecore_Timer;
37	#else
38	typedef struct _Ecore_Timer Ecore_Timer;
39	#endif
40	#endif	34	#endif
41		35
42	namespace JSC {	36	namespace JSC {

Lines 22-33 a/Source/WTF/wtf/efl/RefPtrEfl.h_sec1
- a/Source/WTF/wtf/efl/RefPtrEfl.h -6 lines
22		22
23	#include <wtf/RefPtr.h>	23	#include <wtf/RefPtr.h>
24		24
25	#if USE(EO)
26	typedef struct _Eo_Opaque Evas_Object;
27	#else
28	typedef struct _Evas_Object Evas_Object;
29	#endif
30
31	namespace WTF {	25	namespace WTF {
32		26
33	template<> void refIfNotNull(Evas_Object* ptr);	27	template<> void refIfNotNull(Evas_Object* ptr);

Lines 60-70 typedef GtkWidget* PlatformWidget; a/Source/WebCore/platform/Widget.h_sec1
- a/Source/WebCore/platform/Widget.h -5 lines
60	#endif	60	#endif
61		61
62	#if PLATFORM(EFL)	62	#if PLATFORM(EFL)
63	#if USE(EO)
64	typedef struct _Eo_Opaque Evas_Object;
65	#else
66	typedef struct _Evas_Object Evas_Object;
67	#endif
68	typedef Evas_Object* PlatformWidget;	63	typedef Evas_Object* PlatformWidget;
69	#endif	64	#endif
70		65

Lines 21-33 a/Source/WebCore/platform/efl/EflScreenUtilities.h_sec1
- a/Source/WebCore/platform/efl/EflScreenUtilities.h -7 lines
21		21
22	#include <wtf/text/WTFString.h>	22	#include <wtf/text/WTFString.h>
23		23
24	#if USE(EO)
25	typedef struct _Eo_Opaque Evas;
26	#else
27	typedef struct _Evas Evas;
28	typedef struct _Ecore_Evas Ecore_Evas;
29	#endif
30
31	namespace WebCore {	24	namespace WebCore {
32		25
33	void applyFallbackCursor(Ecore_Evas, const char);	26	void applyFallbackCursor(Ecore_Evas, const char);

Lines 49-56 typedef struct tagPOINT POINT; a/Source/WebCore/platform/graphics/IntPoint.h_sec1
- a/Source/WebCore/platform/graphics/IntPoint.h -2 lines
49	typedef struct tagPOINTS POINTS;	49	typedef struct tagPOINTS POINTS;
50	#elif PLATFORM(GTK)	50	#elif PLATFORM(GTK)
51	typedef struct _GdkPoint GdkPoint;	51	typedef struct _GdkPoint GdkPoint;
52	#elif PLATFORM(EFL)
53	typedef struct _Evas_Point Evas_Point;
54	#endif	52	#endif
55		53
56	namespace WebCore {	54	namespace WebCore {

Lines 43-53 typedef const struct __SCDynamicStore * SCDynamicStoreRef; a/Source/WebCore/platform/network/NetworkStateNotifier.h_sec1
- a/Source/WebCore/platform/network/NetworkStateNotifier.h -5 lines
43		43
44	#include <windows.h>	44	#include <windows.h>
45		45
46	#elif PLATFORM(EFL)
47
48	typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
49	typedef unsigned char Eina_Bool;
50
51	#elif PLATFORM(IOS)	46	#elif PLATFORM(IOS)
52		47
53	#include <wtf/RetainPtr.h>	48	#include <wtf/RetainPtr.h>

Lines 29-40 a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/BatteryClientEfl.h -6 lines
29	#include "BatteryStatus.h"	29	#include "BatteryStatus.h"
30	#include <wtf/PassRefPtr.h>	30	#include <wtf/PassRefPtr.h>
31		31
32	#if USE(EO)
33	typedef struct _Eo_Opaque Evas_Object;
34	#else
35	typedef struct _Evas_Object Evas_Object;
36	#endif
37
38	namespace WebCore {	32	namespace WebCore {
39	class BatteryController;	33	class BatteryController;
40	}	34	}

Lines 35-46 a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h -6 lines
35	#include <atk/atk.h>	35	#include <atk/atk.h>
36	#endif	36	#endif
37		37
38	#if USE(EO)
39	typedef struct _Eo_Opaque Evas_Object;
40	#else
41	typedef struct _Evas_Object Evas_Object;
42	#endif
43
44	typedef struct _Ewk_History_Item Ewk_History_Item;	38	typedef struct _Ewk_History_Item Ewk_History_Item;
45		39
46	typedef Vector<Ewk_History_Item*> HistoryItemChildrenVector;	40	typedef Vector<Ewk_History_Item*> HistoryItemChildrenVector;

Lines 42-53 a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h -6 lines
42	#include <wtf/Forward.h>	42	#include <wtf/Forward.h>
43	#include <wtf/text/StringView.h>	43	#include <wtf/text/StringView.h>
44		44
45	#if USE(EO)
46	typedef struct _Eo_Opaque Evas_Object;
47	#else
48	typedef struct _Evas_Object Evas_Object;
49	#endif
50
51	struct Ewk_Should_Insert_Node_Event {	45	struct Ewk_Should_Insert_Node_Event {
52	WebCore::Node* node;	46	WebCore::Node* node;
53	WebCore::Range* range;	47	WebCore::Range* range;

Lines 31-42 a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h -6 lines
31		31
32	#include "FrameNetworkingContext.h"	32	#include "FrameNetworkingContext.h"
33		33
34	#if USE(EO)
35	typedef struct _Eo_Opaque Evas_Object;
36	#else
37	typedef struct _Evas_Object Evas_Object;
38	#endif
39
40	namespace WebCore {	34	namespace WebCore {
41		35
42	class FrameNetworkingContextEfl : public WebCore::FrameNetworkingContext {	36	class FrameNetworkingContextEfl : public WebCore::FrameNetworkingContext {

Lines 33-44 a/Source/WebKit/efl/WebCoreSupport/NavigatorContentUtilsClientEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/NavigatorContentUtilsClientEfl.h -6 lines
33		33
34	#include <wtf/PassOwnPtr.h>	34	#include <wtf/PassOwnPtr.h>
35		35
36	#if USE(EO)
37	typedef struct _Eo_Opaque Evas_Object;
38	#else
39	typedef struct _Evas_Object Evas_Object;
40	#endif
41
42	namespace WebCore {	36	namespace WebCore {
43	class NavigatorContentUtilsClientEfl : public WebCore::NavigatorContentUtilsClient {	37	class NavigatorContentUtilsClientEfl : public WebCore::NavigatorContentUtilsClient {
44	public:	38	public:

Lines 28-39 a/Source/WebKit/efl/WebCoreSupport/ProgressTrackerClientEfl.h_sec1
- a/Source/WebKit/efl/WebCoreSupport/ProgressTrackerClientEfl.h -6 lines
28		28
29	#include "ProgressTrackerClient.h"	29	#include "ProgressTrackerClient.h"
30		30
31	#if USE(EO)
32	typedef struct _Eo_Opaque Evas_Object;
33	#else
34	typedef struct _Evas_Object Evas_Object;
35	#endif
36
37	namespace WebCore {	31	namespace WebCore {
38		32
39	class ProgressTrackerClientEfl final : public WebCore::ProgressTrackerClient {	33	class ProgressTrackerClientEfl final : public WebCore::ProgressTrackerClient {

Lines 28-39 a/Source/WebKit2/Shared/API/c/efl/WKArrayEfl.h_sec1
- a/Source/WebKit2/Shared/API/c/efl/WKArrayEfl.h -6 lines
28		28
29	#include <WebKit2/WKBase.h>	29	#include <WebKit2/WKBase.h>
30		30
31	/**
32	* @typedef Eina_List
33	* Type for a generic double linked list.
34	*/
35	typedef struct _Eina_List Eina_List;
36
37	WK_EXPORT WKArrayRef WKArrayCreateWithEinaList(Eina_List, WKTypeRef (createWKType)(void*));	31	WK_EXPORT WKArrayRef WKArrayCreateWithEinaList(Eina_List, WKTypeRef (createWKType)(void*));
38		32
39	#endif // WKArrayEfl_h	33	#endif // WKArrayEfl_h

Lines 90-98 class EwkPopupMenu; a/Source/WebKit2/UIProcess/API/efl/EwkView.h_sec1
- a/Source/WebKit2/UIProcess/API/efl/EwkView.h -3 lines
90	class EwkSettings;	90	class EwkSettings;
91	class EwkWindowFeatures;	91	class EwkWindowFeatures;
92		92
93	typedef struct _Evas_GL_Context Evas_GL_Context;
94	typedef struct _Evas_GL_Surface Evas_GL_Surface;
95
96	typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;	93	typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;
97	typedef struct Ewk_View_Smart_Class Ewk_View_Smart_Class;	94	typedef struct Ewk_View_Smart_Class Ewk_View_Smart_Class;
98		95

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +13 lines
		1	2014-03-21 Hyowon Kim <hw1008.kim@samsung.com>
		2
		3	Clean up EFL typedefs.
		4	https://bugs.webkit.org/show_bug.cgi?id=130511
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Move all EFL typedefs into GTypedefs.h.
		9
		10	* TestWebKitAPI/PlatformWebView.h: Remove EFL typedefs.
		11	* WebKitTestRunner/InjectedBundle/TestRunner.h: Ditto.
		12	* WebKitTestRunner/PlatformWebView.h: Ditto.
		13
1	2014-03-21 Andreas Kling <akling@apple.com>	14	2014-03-21 Andreas Kling <akling@apple.com>
2		15
3	RetainPtr API test should use CFArray instead of CFString for testing.	16	RetainPtr API test should use CFArray instead of CFString for testing.

Lines 47-58 typedef HWND PlatformWindow; a/Tools/TestWebKitAPI/PlatformWebView.h_sec1
- a/Tools/TestWebKitAPI/PlatformWebView.h -6 lines
47	typedef WKViewRef PlatformWKView;	47	typedef WKViewRef PlatformWKView;
48	typedef GtkWidget *PlatformWindow;	48	typedef GtkWidget *PlatformWindow;
49	#elif PLATFORM(EFL)	49	#elif PLATFORM(EFL)
50	typedef struct _Ecore_Evas Ecore_Evas;
51	#if USE(EO)
52	typedef struct _Eo_Opaque Evas_Object;
53	#else
54	typedef struct _Evas_Object Evas_Object;
55	#endif
56	typedef Evas_Object* PlatformWKView;	50	typedef Evas_Object* PlatformWKView;
57	typedef Ecore_Evas* PlatformWindow;	51	typedef Ecore_Evas* PlatformWindow;
58	#endif	52	#endif

Lines 40-50 typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef; a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h_sec1
- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h -5 lines
40	#elif PLATFORM(GTK)	40	#elif PLATFORM(GTK)
41	typedef unsigned int PlatformTimerRef;	41	typedef unsigned int PlatformTimerRef;
42	#elif PLATFORM(EFL)	42	#elif PLATFORM(EFL)
43	#if USE(EO)
44	typedef struct _Eo_Opaque Ecore_Timer;
45	#else
46	typedef struct _Ecore_Timer Ecore_Timer;
47	#endif
48	typedef Ecore_Timer* PlatformTimerRef;	43	typedef Ecore_Timer* PlatformTimerRef;
49	#endif	44	#endif
50		45

Lines 43-54 typedef struct _GtkWidget GtkWidget; a/Tools/WebKitTestRunner/PlatformWebView.h_sec1
- a/Tools/WebKitTestRunner/PlatformWebView.h -6 lines
43	typedef WKViewRef PlatformWKView;	43	typedef WKViewRef PlatformWKView;
44	typedef GtkWidget* PlatformWindow;	44	typedef GtkWidget* PlatformWindow;
45	#elif PLATFORM(EFL)	45	#elif PLATFORM(EFL)
46	typedef struct _Ecore_Evas Ecore_Evas;
47	#if USE(EO)
48	typedef struct _Eo_Opaque Evas_Object;
49	#else
50	typedef struct _Evas_Object Evas_Object;
51	#endif
52	typedef Evas_Object* PlatformWKView;	46	typedef Evas_Object* PlatformWKView;
53	typedef Ecore_Evas* PlatformWindow;	47	typedef Ecore_Evas* PlatformWindow;
54	#endif	48	#endif