[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0e01dd31d2f47d241310d3d4ecb01801cc8f102c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 20:21:13 2009 +0000

    2009-12-14  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Implement InjectedScript.evaluateOnSelf() that evaluates functions in the InjectedScript context.
            https://bugs.webkit.org/show_bug.cgi?id=32517
    
            * inspector/front-end/InjectedScript.js:
            (InjectedScript.evaluateOnSelf):
            * inspector/front-end/InjectedScriptAccess.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 398315e..444b72e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-14  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Implement InjectedScript.evaluateOnSelf() that evaluates functions in the InjectedScript context.
+        https://bugs.webkit.org/show_bug.cgi?id=32517
+
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.evaluateOnSelf):
+        * inspector/front-end/InjectedScriptAccess.js:
+
 2009-12-14  Nayan Kumar K  <nayankk at gmail.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 209e99f..4f4168b 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -1079,6 +1079,11 @@ InjectedScript.createProxyObject = function(object, objectId, abbreviate)
     return result;
 }
 
+InjectedScript.evaluateOnSelf = function(funcBody)
+{
+    return window.eval("(" + funcBody + ")();");
+}
+
 InjectedScript.CallFrameProxy = function(id, callFrame)
 {
     this.id = id;
diff --git a/WebCore/inspector/front-end/InjectedScriptAccess.js b/WebCore/inspector/front-end/InjectedScriptAccess.js
index 14a3a6b..e1f2a36 100644
--- a/WebCore/inspector/front-end/InjectedScriptAccess.js
+++ b/WebCore/inspector/front-end/InjectedScriptAccess.js
@@ -76,6 +76,7 @@ InjectedScriptAccess._installHandler("setPropertyValue");
 InjectedScriptAccess._installHandler("setStyleProperty");
 InjectedScriptAccess._installHandler("setStyleText");
 InjectedScriptAccess._installHandler("toggleStyleEnabled");
+InjectedScriptAccess._installHandler("evaluateOnSelf");
 
 // Some methods can't run synchronously even on the injected script side (such as DB transactions).
 // Mark them as asynchronous here.

-- 
WebKit Debian packaging