[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Thu Apr 8 02:21:40 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 903cf70c26d1b7ee02b492e1fd796670a1c41214
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 08:47:59 2010 +0000

    2010-03-13  Leandro Pereira  <leandro at profusion.mobi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Add EFL port files to efl/ewk.
            http://webkit.org/b/35934
    
            * efl/ewk/EWebKit.h: Added.
            * efl/ewk/ewk_eapi.h: Added.
            * efl/ewk/ewk_logging.h: Added.
            * efl/ewk/ewk_private.h: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55953 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9c99db0..6418e69 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-13  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35934
+
+        * efl/ewk/EWebKit.h: Added.
+        * efl/ewk/ewk_eapi.h: Added.
+        * efl/ewk/ewk_logging.h: Added.
+        * efl/ewk/ewk_private.h: Added.
+
 2010-03-11  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/efl/ewk/EWebKit.h b/WebKit/efl/ewk/EWebKit.h
new file mode 100644
index 0000000..d87d204
--- /dev/null
+++ b/WebKit/efl/ewk/EWebKit.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2008-2009 INdT - Instituto Nokia de Tecnologia
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2010 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EWebKit_h
+#define EWebKit_h
+
+#include "ewk_eapi.h"
+#include "ewk_frame.h"
+#include "ewk_history.h"
+#include "ewk_main.h"
+#include "ewk_settings.h"
+#include "ewk_view.h"
+
+#include <Evas.h>
+
+#endif // EWebKit_h
diff --git a/WebKit/efl/ewk/ewk_eapi.h b/WebKit/efl/ewk/ewk_eapi.h
new file mode 100644
index 0000000..adb8d7b
--- /dev/null
+++ b/WebKit/efl/ewk/ewk_eapi.h
@@ -0,0 +1,50 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2010 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_eapi_h
+#define ewk_eapi_h
+
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef _WIN32
+# ifdef BUILDING_WEBKIT
+#  ifdef DLL_EXPORT
+#   define EAPI __declspec(dllexport)
+#  else
+#   define EAPI
+#  endif /* ! DLL_EXPORT */
+# else
+#  define EAPI __declspec(dllimport)
+# endif /* ! EFL_EINA_BUILD */
+#else
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EAPI __attribute__ ((visibility("default")))
+#  else
+#   define EAPI
+#  endif
+# else
+#  define EAPI
+# endif
+#endif
+
+#endif // ewk_eapi_h
diff --git a/WebKit/efl/ewk/ewk_logging.h b/WebKit/efl/ewk/ewk_logging.h
new file mode 100644
index 0000000..045bd9c
--- /dev/null
+++ b/WebKit/efl/ewk/ewk_logging.h
@@ -0,0 +1,31 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2010 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_logging_h
+#define ewk_logging_h
+
+extern int _ewk_log_dom;
+#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__)
+#define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+#define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
+#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
+
+#endif // ewk_logging_h
diff --git a/WebKit/efl/ewk/ewk_private.h b/WebKit/efl/ewk/ewk_private.h
new file mode 100644
index 0000000..947bd79
--- /dev/null
+++ b/WebKit/efl/ewk/ewk_private.h
@@ -0,0 +1,115 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2010 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_private_h
+#define ewk_private_h
+
+#include "BackForwardList.h"
+#include "EWebKit.h"
+#include "Frame.h"
+#include "Page.h"
+#include "Settings.h"
+#include "Widget.h"
+#include "ewk_logging.h"
+#include "ewk_util.h"
+
+#include <cairo.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/Vector.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// If defined, ewk will do type checking to ensure objects are of correct type
+#define EWK_TYPE_CHECK 1
+
+void             ewk_view_ready(Evas_Object *o);
+void             ewk_view_title_set(Evas_Object *o, const char *title);
+void             ewk_view_uri_changed(Evas_Object *o);
+void             ewk_view_load_started(Evas_Object *o);
+void             ewk_view_frame_main_load_started(Evas_Object *o);
+void             ewk_view_load_finished(Evas_Object *o, const Ewk_Frame_Load_Error *error);
+void             ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error);
+void             ewk_view_load_progress_changed(Evas_Object *o);
+
+void             ewk_view_mouse_link_hover_in(Evas_Object *o, void *data);
+void             ewk_view_mouse_link_hover_out(Evas_Object *o);
+
+void             ewk_view_toolbars_visible_set(Evas_Object *o, Eina_Bool visible);
+void             ewk_view_toolbars_visible_get(Evas_Object *o, Eina_Bool *visible);
+
+void             ewk_view_statusbar_visible_set(Evas_Object *o, Eina_Bool visible);
+void             ewk_view_statusbar_visible_get(Evas_Object *o, Eina_Bool *visible);
+void             ewk_view_statusbar_text_set(Evas_Object *o, const char *text);
+
+void             ewk_view_scrollbars_visible_set(Evas_Object *o, Eina_Bool visible);
+void             ewk_view_scrollbars_visible_get(Evas_Object *o, Eina_Bool *visible);
+
+void             ewk_view_menubar_visible_set(Evas_Object *o, Eina_Bool visible);
+void             ewk_view_menubar_visible_get(Evas_Object *o, Eina_Bool *visible);
+
+void             ewk_view_tooltip_text_set(Evas_Object *o, const char *text);
+
+void             ewk_view_add_console_message(Evas_Object *o, const char *message, unsigned int lineNumber, const char *sourceID);
+
+void             ewk_view_run_javascript_alert(Evas_Object *o, Evas_Object *frame, const char *message);
+Eina_Bool        ewk_view_run_javascript_confirm(Evas_Object *o, Evas_Object *frame, const char *message);
+Eina_Bool        ewk_view_run_javascript_prompt(Evas_Object *o, Evas_Object *frame, const char *message, const char *defaultValue, char **value);
+Eina_Bool        ewk_view_should_interrupt_javascript(Evas_Object *o);
+void             ewk_view_exceeded_database_quota(Evas_Object *o, Evas_Object *frame, const char *databaseName);
+
+void             ewk_view_repaint(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+void             ewk_view_scroll(Evas_Object *o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame);
+WebCore::Page   *ewk_view_core_page_get(const Evas_Object *o);
+
+WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object *o, Evas_Object *frame, const WebCore::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WebCore::String& referrer);
+
+WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* o, Evas_Object* frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WebCore::String>& paramNames, const WTF::Vector<WebCore::String>& paramValues, const WebCore::String& mimeType, bool loadManually);
+
+Ewk_History      *ewk_history_new(WebCore::BackForwardList *history);
+void              ewk_history_free(Ewk_History *history);
+
+Evas_Object      *ewk_frame_add(Evas *e);
+Eina_Bool         ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame);
+Evas_Object      *ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WebCore::String& name, const WebCore::KURL& url, const WebCore::String& referrer);
+
+WebCore::Frame   *ewk_frame_core_get(const Evas_Object *o);
+void              ewk_frame_core_gone(Evas_Object *o);
+
+void              ewk_frame_load_started(Evas_Object *o);
+void              ewk_frame_load_finished(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
+void              ewk_frame_load_error(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
+void              ewk_frame_load_progress_changed(Evas_Object *o);
+
+void              ewk_frame_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h);
+void              ewk_frame_title_set(Evas_Object *o, const char *title);
+
+void              ewk_frame_view_create_for_view(Evas_Object *o, Evas_Object *view);
+Eina_Bool         ewk_frame_uri_changed(Evas_Object *o);
+void              ewk_frame_force_layout(Evas_Object *o);
+
+WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WebCore::String>& paramNames, const WTF::Vector<WebCore::String>& paramValues, const WebCore::String& mimeType, bool loadManually);
+
+#ifdef __cplusplus
+
+}
+#endif
+#endif // ewk_private_h

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list