[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
podivilov at chromium.org
podivilov at chromium.org
Wed Dec 22 14:58:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f95d62fca1472f67204dff05a4548d250a4313e4
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 26 20:29:37 2010 +0000
2010-10-26 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: console doesn't work in closures when window is overrode
https://bugs.webkit.org/show_bug.cgi?id=48320
* inspector/front-end/InjectedScript.js:
(injectedScriptConstructor.):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 98778d8..1376185 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-26 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: console doesn't work in closures when window is overrode
+ https://bugs.webkit.org/show_bug.cgi?id=48320
+
+ * inspector/front-end/InjectedScript.js:
+ (injectedScriptConstructor.):
+
2010-10-26 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 24b270b..2d60f69 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -268,7 +268,7 @@ InjectedScript.prototype = {
// We don't want local variables to be shadowed by global ones when evaluating on CallFrame.
if (!isEvalOnCallFrame)
expression = "with (window) {\n" + expression + "\n} ";
- expression = "with (window.console._commandLineAPI) {\n" + expression + "\n}";
+ expression = "with (window ? window.console._commandLineAPI : {}) {\n" + expression + "\n}";
var value = evalFunction.call(object, expression);
delete inspectedWindow.console._commandLineAPI;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list