Changeset 100204 in webkit

Timestamp:

Nov 14, 2011, 4:01:15 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Update ewk_frame_script_execute to return the result for JavaScript
​https://bugs.webkit.org/show_bug.cgi?id=65972

Patch by Jongseok Yang <​js45.yang@samsung.com> on 2011-11-14
Reviewed by Antonio Gomes.

It executes the javascript and converts the result to a string using toString.
And it returns the memory-allocated pointer for the value.

• ewk/ewk_frame.cpp:

(ewk_frame_script_execute):

• ewk/ewk_frame.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_frame.cpp (modified) (1 diff)
• ewk/ewk_frame.h (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-11-14  Jongseok Yang  <js45.yang@samsung.com>
+
+        [EFL] Update ewk_frame_script_execute to return the result for JavaScript
+        https://bugs.webkit.org/show_bug.cgi?id=65972
+
+        Reviewed by Antonio Gomes.
+
+        It executes the javascript and converts the result to a string using toString.
+        And it returns the memory-allocated pointer for the value.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_script_execute):
+        * ewk/ewk_frame.h:
+
 2011-11-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

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

@@ -417 +417 @@
 }
 
-Eina_Bool ewk_frame_script_execute(Evas_Object* ewkFrame, const char* script)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(smartData->frame, false);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(script, false);
-    smartData->frame->script()->executeScript(WTF::String::fromUTF8(script), true);
-    return true;
+char* ewk_frame_script_execute(Evas_Object* ewkFrame, const char* script)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(script, 0);
+
+#if USE(JSC)
+    WTF::String resultString;
+    JSC::JSValue result = smartData->frame->script()->executeScript(WTF::String::fromUTF8(script), true).jsValue();
+
+    if (!smartData->frame) // In case the script removed our frame from the page.
+        return 0;
+
+    if (!result || (!result.isBoolean() && !result.isString() && !result.isNumber()))
+        return 0;
+
+    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
+    resultString = WebCore::ustringToString(result.toString(smartData->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()));
+    return strdup(resultString.utf8().data());
+#else
+    notImplemented();
+    return 0;
+#endif
 }
 

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

@@ -320 +320 @@
  * Requests execution of the given script.
  *
+ * The returned string @b should be freed after use.
+ *
  * @param o frame object to execute script
  * @param script Java Script to execute
  *
- * @return @c EINA_TRUE if request was done, @c EINA_FALSE on errors
- */
-EAPI Eina_Bool    ewk_frame_script_execute(Evas_Object *o, const char *script);
+ * @return newly allocated string for result or @c 0 if the result cannot be converted to string or failure
+ */
+EAPI char        *ewk_frame_script_execute(Evas_Object *o, const char *script);
 
 /**