Changeset 56972 in webkit

Timestamp:

Apr 1, 2010 11:09:07 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-01 Jay Civelli <​jcivelli@google.com>

Reviewed by David Levin.

Adds a method to WebFrame to execute JavaScript and get the value
it evaluates to.
​https://bugs.webkit.org/show_bug.cgi?id=36907

• public/WebFrame.h:
• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::executeScriptAndReturnValue):
• src/WebFrameImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebFrame.h (modified) (2 diffs)
• src/WebFrameImpl.cpp (modified) (1 diff)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-01  Jay Civelli  <jcivelli@google.com>
+
+        Reviewed by David Levin.
+
+        Adds a method to WebFrame to execute JavaScript and get the value
+        it evaluates to.
+        https://bugs.webkit.org/show_bug.cgi?id=36907
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::executeScriptAndReturnValue):
+        * src/WebFrameImpl.h:
+
 2010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/WebKit/chromium/public/WebFrame.h

@@ -40 +40 @@
 namespace v8 {
 class Context;
+class Value;
+template <class T> class Handle;
 template <class T> class Local;
 }
@@ -226 +228 @@
 
 #if WEBKIT_USING_V8
+    // Executes script in the context of the current page and returns the value
+    // that the script evaluated to.
+    virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
+        const WebScriptSource&) = 0;
+
     // Returns the V8 context for this frame, or an empty handle if there
     // is none.

trunk/WebKit/chromium/src/WebFrameImpl.cpp

@@ -780 +780 @@
 
 #if USE(V8)
+v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(
+    const WebScriptSource& source)
+{
+    return m_frame->script()->executeScript(
+        ScriptSourceCode(source.code, source.url, source.startLine)).v8Value();
+}
+
 // Returns the V8 context for this frame, or an empty handle if there is none.
 v8::Local<v8::Context> WebFrameImpl::mainWorldScriptContext() const

trunk/WebKit/chromium/src/WebFrameImpl.h

@@ -102 +102 @@
     virtual void collectGarbage();
 #if WEBKIT_USING_V8
+    virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
+        const WebScriptSource&);
     virtual v8::Local<v8::Context> mainWorldScriptContext() const;
 #endif