From bad146c5b3b1a7d0368320fecdbd5b50dbe97501 Mon Sep 17 00:00:00 2001
From: "aa@chromium.org" <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 13 Mar 2009 23:26:13 +0000
Subject: Commit 40144. I had to move to to a separate CL to use gcl's "try
 multiple commits" feature.

Review URL: http://codereview.chromium.org/46062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11683 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/glue/webframe_impl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webkit/glue/webframe_impl.h')

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index e49802f..f448fa3 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -90,9 +90,9 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
                                           const GURL& error_page_url,
                                           bool replace,
                                           const GURL& fake_url);
-  virtual void ExecuteJavaScript(const std::string& js_code,
-                                 const GURL& script_url,
-                                 int start_line);
+  virtual void ExecuteScript(const webkit_glue::WebScriptSource& source);
+  virtual void ExecuteScriptInNewContext(
+      const webkit_glue::WebScriptSource* sources, int num_sources);
   virtual bool GetPreviousHistoryState(std::string* history_state) const;
   virtual bool GetCurrentHistoryState(std::string* history_state) const;
   virtual bool HasCurrentHistoryState() const;
-- 
cgit v1.1