Revert "Fix build breakage with updated EFL"

This reverts commit 2470b6b92f18537c4fe42b94fbd9668c8ff4b25b.

This patch was added to make webkit-efl work with a very recent version
of EFL off the master branch.  Since adding this we have moved the Tizen
IVI codebase to a stable snapshot of 1.7 which doesn't need this change.

diff --git a/Source/WTF/wtf/OwnPtrCommon.h b/Source/WTF/wtf/OwnPtrCommon.h
index c378ae6..86670e9 100644 (file)
--- a/Source/WTF/wtf/OwnPtrCommon.h
+++ b/Source/WTF/wtf/OwnPtrCommon.h
@@ -39,12 +39,12 @@ typedef struct HRGN__* HRGN;
 #endif
 
 #if PLATFORM(EFL)
-typedef struct _Eo Eo;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef struct _Ecore_Pipe Ecore_Pipe;
+typedef struct _Ecore_Timer Ecore_Timer;
 typedef struct _Eina_Hash Eina_Hash;
 typedef struct _Eina_Module Eina_Module;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 #endif
 
 namespace WTF {
@@ -69,6 +69,7 @@ namespace WTF {
 #if PLATFORM(EFL)
     void deleteOwnedPtr(Ecore_Evas*);
     void deleteOwnedPtr(Ecore_Pipe*);
+    void deleteOwnedPtr(Ecore_Timer*);
     void deleteOwnedPtr(Eina_Hash*);
     void deleteOwnedPtr(Eina_Module*);
     void deleteOwnedPtr(Evas_Object*);

diff --git a/Source/WTF/wtf/efl/OwnPtrEfl.cpp b/Source/WTF/wtf/efl/OwnPtrEfl.cpp
index 91c7752..6501a96 100644 (file)
--- a/Source/WTF/wtf/efl/OwnPtrEfl.cpp
+++ b/Source/WTF/wtf/efl/OwnPtrEfl.cpp
@@ -63,4 +63,10 @@ void deleteOwnedPtr(Eina_Module* ptr)
         eina_module_free(ptr); // If module wasn't unloaded, eina_module_free() calls eina_module_unload().
 }
 
+void deleteOwnedPtr(Ecore_Timer* ptr)
+{
+    if (ptr)
+        ecore_timer_del(ptr);
+}
+
 }

diff --git a/Source/WebCore/platform/Widget.h b/Source/WebCore/platform/Widget.h
index 9260b45..8f3ef57 100644 (file)
--- a/Source/WebCore/platform/Widget.h
+++ b/Source/WebCore/platform/Widget.h
@@ -78,9 +78,8 @@ typedef wxWindow* PlatformWidget;
 #endif
 
 #if PLATFORM(EFL)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
-typedef Eo Evas;
+typedef struct _Evas_Object Evas_Object;
+typedef struct _Evas Evas;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef Evas_Object* PlatformWidget;
 #endif

diff --git a/Source/WebCore/platform/efl/EflScreenUtilities.h b/Source/WebCore/platform/efl/EflScreenUtilities.h
index 9984f13..566d877 100644 (file)
--- a/Source/WebCore/platform/efl/EflScreenUtilities.h
+++ b/Source/WebCore/platform/efl/EflScreenUtilities.h
@@ -25,8 +25,7 @@
 #include "IntSize.h"
 #endif
 
-typedef struct _Eo Eo;
-typedef Eo Evas;
+typedef struct _Evas Evas;
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/efl/RefPtrEfl.h b/Source/WebCore/platform/efl/RefPtrEfl.h
index f8fe8ae..4815284 100644 (file)
--- a/Source/WebCore/platform/efl/RefPtrEfl.h
+++ b/Source/WebCore/platform/efl/RefPtrEfl.h
@@ -22,8 +22,7 @@
 
 #include <wtf/RefPtr.h>
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WTF {
 

diff --git a/Source/WebCore/platform/efl/RenderThemeEfl.h b/Source/WebCore/platform/efl/RenderThemeEfl.h
index 212c531..a3c58ff 100644 (file)
--- a/Source/WebCore/platform/efl/RenderThemeEfl.h
+++ b/Source/WebCore/platform/efl/RenderThemeEfl.h
@@ -37,9 +37,8 @@
 
 #include <cairo.h>
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
 typedef struct _Ecore_Evas Ecore_Evas;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/Icon.h b/Source/WebCore/platform/graphics/Icon.h
index 64c3b20..b703c71 100644 (file)
--- a/Source/WebCore/platform/graphics/Icon.h
+++ b/Source/WebCore/platform/graphics/Icon.h
@@ -36,8 +36,7 @@ typedef struct HICON__* HICON;
 #elif PLATFORM(GTK)
 typedef struct _GdkPixbuf GdkPixbuf;
 #elif PLATFORM(EFL)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 #elif PLATFORM(CHROMIUM)
 #include "Image.h"
 #include "PlatformIcon.h"

diff --git a/Source/WebCore/platform/graphics/efl/GLContextEfl.h b/Source/WebCore/platform/graphics/efl/GLContextEfl.h
index 0be1deb..915c4ac 100755 (executable)
--- a/Source/WebCore/platform/graphics/efl/GLContextEfl.h
+++ b/Source/WebCore/platform/graphics/efl/GLContextEfl.h
@@ -28,8 +28,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 class GLContextEfl : public RefCounted<GLContextEfl> {
 public:

diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index 711bb97..c987ac3 100755 (executable)
--- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -39,8 +39,7 @@
 #include "NotificationClient.h"
 #endif
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
index 00a9098..c8007a2 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
@@ -29,8 +29,7 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 typedef struct _Ewk_History_Item Ewk_History_Item;
 typedef struct _Ewk_Intent Ewk_Intent;
 typedef struct _Ewk_Intent_Request Ewk_Intent_Request;

diff --git a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
index 2d95030..78cd58e 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
@@ -45,8 +45,7 @@
 #include <Ecore.h>
 #endif
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 struct Ewk_Should_Insert_Node_Event {
     WebCore::Node* node;

diff --git a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h b/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
index d430ee7..93ffd48 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
@@ -31,8 +31,7 @@
 
 #include "FrameNetworkingContext.h"
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h b/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
index cec66e9..6f98d70 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
@@ -23,8 +23,7 @@
 #include "IntRect.h"
 
 typedef struct _Evas_Native_Surface Evas_Native_Surface;
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebCore {
 class GraphicsContext3D;

diff --git a/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h b/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
index 74f02a8..5a068ef 100644 (file)
--- a/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
+++ b/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
@@ -24,8 +24,7 @@
 #error "Please #include \"WKAPICast.h\" instead of this file directly."
 #endif
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/C/efl/WKView.h b/Source/WebKit2/UIProcess/API/C/efl/WKView.h
index 33c29b3..f1ddac9 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/C/efl/WKView.h
+++ b/Source/WebKit2/UIProcess/API/C/efl/WKView.h
@@ -22,8 +22,7 @@
 
 #include <WebKit2/WKBase.h>
 
-typedef struct _Eo Eo;
-typedef Eo Evas;
+typedef struct _Evas Evas;
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/Source/WebKit2/UIProcess/API/efl/InputPicker.h b/Source/WebKit2/UIProcess/API/efl/InputPicker.h
index 8271330..8f88972 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/InputPicker.h
+++ b/Source/WebKit2/UIProcess/API/efl/InputPicker.h
@@ -27,8 +27,7 @@
 #include "ewk_view_private.h"
 #endif
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 struct Input_Date {
     int year;

diff --git a/Source/WebKit2/UIProcess/API/efl/JavaScriptPopup.h b/Source/WebKit2/UIProcess/API/efl/JavaScriptPopup.h
index 87af57d..779699c 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/JavaScriptPopup.h
+++ b/Source/WebKit2/UIProcess/API/efl/JavaScriptPopup.h
@@ -21,8 +21,7 @@
 #define JavaScriptPopup_h
 
 #if OS(TIZEN)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/efl/OpenPanel.h b/Source/WebKit2/UIProcess/API/efl/OpenPanel.h
index 482b093..11049ff 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/OpenPanel.h
+++ b/Source/WebKit2/UIProcess/API/efl/OpenPanel.h
@@ -23,8 +23,7 @@
 #define OpenPanel_h
 
 #if OS(TIZEN)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_util.h b/Source/WebKit2/UIProcess/API/efl/ewk_util.h
index 1d5f0ce..203e89f 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_util.h
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_util.h
@@ -20,9 +20,8 @@
 #ifndef ewk_util_h
 #define ewk_util_h
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
-typedef Eo Evas;
+typedef struct _Evas Evas;
+typedef struct _Evas_Object Evas_Object;
 typedef struct _cairo_surface cairo_surface_t;
 
 Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface);

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
index 2aa9f9f..6529d77 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
@@ -20,8 +20,7 @@
 #ifndef ewk_popup_picker_h
 #define ewk_popup_picker_h
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 typedef struct _Elm_Object_Item Elm_Object_Item;
 typedef struct _Eina_List Eina_List;
 

diff --git a/Source/WebKit2/UIProcess/efl/WebColorChooserProxyEfl.h b/Source/WebKit2/UIProcess/efl/WebColorChooserProxyEfl.h
index d79d594..87e80b2 100644 (file)
--- a/Source/WebKit2/UIProcess/efl/WebColorChooserProxyEfl.h
+++ b/Source/WebKit2/UIProcess/efl/WebColorChooserProxyEfl.h
@@ -31,8 +31,7 @@
 #include "Color.h"
 #include "WebColorChooserProxy.h"
 
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h b/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
index 36ac0ce..6df0064 100755 (executable)
--- a/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
+++ b/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
@@ -24,8 +24,7 @@
 #include <WebCore/IntRect.h>
 
 #if ENABLE(TIZEN_WEBKIT2_POPUP)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 
 namespace WebKit {
 

diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
index 93d8ac7..cba9171 100644 (file)
--- a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
@@ -4556,8 +4556,7 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assert_lint('typedef struct _Ecore_Evas Ecore_Evas;', '')
         self.assert_lint('typedef struct _Ecore_Pipe Ecore_Pipe;', '')
         self.assert_lint('typedef struct _Eina_Rectangle Eina_Rectangle;', '')
-        self.assert_lint('typedef struct Eo;', '')
-        self.assert_lint('typedef Eo Evas_Object;', '')
+        self.assert_lint('typedef struct _Evas_Object Evas_Object;', '')
         self.assert_lint('typedef struct _Ewk_History_Item Ewk_History_Item;', '')
 
         # NPAPI functions that start with NPN_, NPP_ or NP_ are allowed.

diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index b5644bb..4b1bb04 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -44,8 +44,7 @@ typedef QTimer PlatformTimerRef;
 #elif PLATFORM(GTK)
 typedef unsigned int PlatformTimerRef;
 #elif PLATFORM(EFL)
-typedef struct _Eo Eo;
-typedef Eo Ecore_Timer;
+typedef struct _Ecore_Timer Ecore_Timer;
 typedef Ecore_Timer* PlatformTimerRef;
 #endif
 

diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
index f44c7f7..4ab0104 100644 (file)
--- a/Tools/WebKitTestRunner/PlatformWebView.h
+++ b/Tools/WebKitTestRunner/PlatformWebView.h
@@ -52,8 +52,7 @@ typedef struct _GtkWidget GtkWidget;
 typedef WKViewRef PlatformWKView;
 typedef GtkWidget* PlatformWindow;
 #elif PLATFORM(EFL)
-typedef struct _Eo Eo;
-typedef Eo Evas_Object;
+typedef struct _Evas_Object Evas_Object;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef Evas_Object* PlatformWKView;
 typedef Ecore_Evas* PlatformWindow;

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 63b6f89..119acbd 100755 (executable)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -20,7 +20,6 @@ BuildRequires: pkgconfig(edje)
 BuildRequires: pkgconfig(eina)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(eo)
 BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(freetype2)
 BuildRequires: pkgconfig(glib-2.0)