Changeset 93637 in webkit

Timestamp:

Aug 23, 2011 2:01:52 PM (13 years ago)

Author:

demarchi@webkit.org

Message:

Source/WebKit: Patch by Jonas M. Gastal <​jgastal@profusion.mobi> on 2011-08-23
Reviewed by Antonio Gomes.

[EFL] Exporting JavaScript objects for EFL port
​https://bugs.webkit.org/show_bug.cgi?id=43446

This patch allows to export objects to JavaScript API,
just like qt does, but it uses the netscape api
to do the convertion to javascript object.

• CMakeLists.txt:

Adding necessary files for the patch.

Source/WebKit/efl: [EFL] Exporting JavaScript objects for EFL port
​https://bugs.webkit.org/show_bug.cgi?id=43446

Patch by Jonas M. Gastal <​jgastal@profusion.mobi> on 2011-08-23
Reviewed by Antonio Gomes.

This patch allows to export objects to JavaScript API,
just like qt does, but it uses the netscape api
to do the convertion to javascript object.

• CMakeLists.txt:
• WebCoreSupport/FrameLoaderClientEfl.cpp:

(WebCore::FrameLoaderClientEfl::dispatchDidClearWindowObjectInWorld):

• ewk/EWebKit.h:
• ewk/ewk_js.cpp: Added.

(ewk_js_variant_to_npvariant):
(ewk_js_npvariant_to_variant):
(ewk_js_property_has):
(ewk_js_property_get):
(ewk_js_property_set):
(ewk_js_property_remove):
(ewk_js_properties_enumerate):
(ewk_js_method_has):
(ewk_js_method_invoke):
(ewk_js_class_new):
(ewk_js_class_free):
(ewk_js_object_new):
(ewk_js_object_free):
(ewk_js_object_properties_get):
(ewk_js_object_name_get):
(ewk_js_variant_free):

• ewk/ewk_js.h: Added.
• ewk/ewk_main.cpp:

(ewk_init):

• ewk/ewk_private.h:
• ewk/ewk_view.cpp:

(ewk_view_js_window_object_clear):
(ewk_view_js_object_add):

• ewk/ewk_view.h:

Location:

trunk/Source/WebKit

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• efl/CMakeListsEfl.txt (modified) (1 diff)
• efl/ChangeLog (modified) (1 diff)
• efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (1 diff)
• efl/ewk/EWebKit.h (modified) (1 diff)
• efl/ewk/ewk_js.cpp (added)
• efl/ewk/ewk_js.h (added)
• efl/ewk/ewk_private.h (modified) (3 diffs)
• efl/ewk/ewk_view.cpp (modified) (4 diffs)
• efl/ewk/ewk_view.h (modified) (3 diffs)

trunk/Source/WebKit/CMakeLists.txt

@@ -6 +6 @@
     "${WEBCORE_DIR}/bindings"
     "${WEBCORE_DIR}/bridge"
+    "${WEBCORE_DIR}/bridge/c"
     "${WEBCORE_DIR}/bridge/jsc"
     "${WEBCORE_DIR}/css"

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2011-08-23  Jonas M. Gastal <jgastal@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Exporting JavaScript objects for EFL port
+        https://bugs.webkit.org/show_bug.cgi?id=43446
+
+        This patch allows to export objects to JavaScript API,
+        just like qt does, but it uses the netscape api
+        to do the convertion to javascript object.
+
+        * CMakeLists.txt:
+        Adding necessary files for the patch.
+
 2011-08-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/efl/CMakeListsEfl.txt

@@ -81 +81 @@
     efl/ewk/ewk_view_tiled.c
     efl/ewk/ewk_window_features.cpp
+    efl/ewk/ewk_js.cpp
 )
 

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-23  Jonas M. Gastal <jgastal@profusion.mobi>
+
+        [EFL] Exporting JavaScript objects for EFL port
+        https://bugs.webkit.org/show_bug.cgi?id=43446
+
+        Reviewed by Antonio Gomes.
+
+        This patch allows to export objects to JavaScript API,
+        just like qt does, but it uses the netscape api
+        to do the convertion to javascript object.
+
+        * CMakeLists.txt:
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::dispatchDidClearWindowObjectInWorld):
+        * ewk/EWebKit.h:
+        * ewk/ewk_js.cpp: Added.
+        (ewk_js_variant_to_npvariant):
+        (ewk_js_npvariant_to_variant):
+        (ewk_js_property_has):
+        (ewk_js_property_get):
+        (ewk_js_property_set):
+        (ewk_js_property_remove):
+        (ewk_js_properties_enumerate):
+        (ewk_js_method_has):
+        (ewk_js_method_invoke):
+        (ewk_js_class_new):
+        (ewk_js_class_free):
+        (ewk_js_object_new):
+        (ewk_js_object_free):
+        (ewk_js_object_properties_get):
+        (ewk_js_object_name_get):
+        (ewk_js_variant_free):
+        * ewk/ewk_js.h: Added.
+        * ewk/ewk_main.cpp:
+        (ewk_init):
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (ewk_view_js_window_object_clear):
+        (ewk_view_js_object_add):
+        * ewk/ewk_view.h:
+
 2011-08-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

@@ -441 +441 @@
 
     evas_object_smart_callback_call(m_view, "window,object,cleared", &event);
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+    ewk_view_js_window_object_clear(m_view, m_frame);
+#endif
 }
 

trunk/Source/WebKit/efl/ewk/EWebKit.h

@@ -35 +35 @@
 #include "ewk_frame.h"
 #include "ewk_history.h"
+#include "ewk_js.h"
 #include "ewk_main.h"
 #include "ewk_network.h"

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -31 +31 @@
 #include "EWebKit.h"
 #include "Frame.h"
+#include "NP_jsobject.h"
 #include "Page.h"
 #include "Settings.h"
 #include "Widget.h"
+#include "ewk_js.h"
 #include "ewk_logging.h"
 #include "ewk_util.h"
@@ -47 +49 @@
 // If defined, ewk will do type checking to ensure objects are of correct type
 #define EWK_TYPE_CHECK 1
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+#define EWK_JS_OBJECT_MAGIC 0x696969
+
+typedef struct _Ewk_JS_Class Ewk_JS_Class;
+struct _Ewk_JS_Object {
+    JavaScriptObject base;
+    const char *name;
+    const Ewk_JS_Class *cls;
+    Eina_Hash *properties;
+    Evas_Object *view; // ewk_view: check if this object has already been added to another ewk_view
+    Ewk_JS_Object_Type type;
+    EINA_MAGIC;
+};
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
 // forward declarations
@@ -122 +139 @@
 void ewk_view_editor_client_selection_changed(Evas_Object *o);
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
+void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame);
+#endif
+
 int ewk_util_dpi_get(void);
 void ewk_util_javascript_gc_collect();

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -24 +24 @@
 
 #include "BackForwardListImpl.h"
+#include "Bridge.h"
 #include "Chrome.h"
 #include "ChromeClientEfl.h"
@@ -41 +42 @@
 #include "InspectorClientEfl.h"
 #include "IntSize.h"
+#include "JSDOMBinding.h"
+#include "JSDOMWindow.h"
+#include "JSLock.h"
 #include "PlatformMouseEvent.h"
 #include "PopupMenuClient.h"
 #include "ProgressTracker.h"
 #include "RenderTheme.h"
+#include "c_instance.h"
 #include "ewk_private.h"
 
@@ -3391 +3396 @@
 /**
  * @internal
+ * Reports the JS window object was cleared.
+ *
+ * @param o view.
+ * @param frame the frame.
+ */
+void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame)
+{
+    evas_object_smart_callback_call(o, "js,windowobject,clear", frame);
+}
+
+/**
+ * @internal
  * Reports the viewport has changed.
  *
@@ -3539 +3556 @@
     return sd->api->navigation_policy_decision(sd, request);
 }
+
+Eina_Bool ewk_view_js_object_add(Evas_Object *o, Ewk_JS_Object *obj, const char *obj_name)
+{
+#if ENABLE(NETSCAPE_PLUGIN_API)
+    if (obj->view) // object has already been added to another ewk_view
+        return EINA_FALSE;
+    obj->name = eina_stringshare_add(obj_name);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+
+    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
+    WebCore::JSDOMWindow *window = toJSDOMWindow(priv->main_frame, WebCore::mainThreadNormalWorld());
+    JSC::Bindings::RootObject *root;
+    root = priv->main_frame->script()->bindingRootObject();
+
+    if (!window) {
+        ERR("Warning: couldn't get window object");
+        return EINA_FALSE;
+    }
+
+    JSC::ExecState* exec = window->globalExec();
+
+    obj->view = o;
+    JSC::JSObject *runtimeObject = (JSC::JSObject*)JSC::Bindings::CInstance::create((NPObject*)obj, root)->createRuntimeObject(exec);
+    JSC::Identifier id = JSC::Identifier(exec, obj_name);
+
+    JSC::PutPropertySlot slot;
+    window->put(exec, id, runtimeObject, slot);
+    return EINA_TRUE;
+#else
+    return EINA_FALSE;
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+}
+
 
 /**

trunk/Source/WebKit/efl/ewk/ewk_view.h

@@ -41 +41 @@
  *  - "inputmethod,changed", Eina_Bool: reports that input method was changed and
  *    it gives a boolean value whether it's enabled or not as an argument.
+ *  - "js,windowobject,clear", void: Report that the JS window object has been cleared.
  *  - "link,hover,in", const char *link[2]: reports mouse is over a link.
  *    It gives the url in link[0] and link's title in link[1] as an argument.
@@ -86 +87 @@
 #include "ewk_frame.h"
 #include "ewk_history.h"
+#include "ewk_js.h"
 #include "ewk_window_features.h"
 
@@ -2176 +2178 @@
  */
 EAPI Ewk_View_Mode ewk_view_mode_get(Evas_Object *o);
+
+/**
+ * Creates a JS object named @a obj_name as property of the window object. This should be called on a callback connectedto the
+ * js,windowobject,clear signal.
+ *
+ * @param o view.
+ * @param obj object that will be added(see: @a ewk_js_object_new).
+ * @param obj_name name of the object.
+ *
+ * @return @c EINA_TRUE if object was added, @c EINA_FALSE if not.
+ */
+EAPI Eina_Bool ewk_view_js_object_add(Evas_Object *o, Ewk_JS_Object *obj, const char *obj_name);
 #ifdef __cplusplus
 }