[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
caseq at chromium.org
caseq at chromium.org
Wed Dec 22 12:54:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6489ee356faba435b0058f17761f2498afec4487
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 1 19:37:10 2010 +0000
2010-09-01 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: webInspector.inspectedWindow.evaluate() should not fail if not passed callback.
https://bugs.webkit.org/show_bug.cgi?id=45037
* inspector/front-end/ExtensionAPI.js:
(WebInspector.injectedExtensionAPI.InspectedWindow.prototype.evaluate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66613 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5d6e88f..8f52264 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-01 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: webInspector.inspectedWindow.evaluate() should not fail if not passed callback.
+ https://bugs.webkit.org/show_bug.cgi?id=45037
+
+ * inspector/front-end/ExtensionAPI.js:
+ (WebInspector.injectedExtensionAPI.InspectedWindow.prototype.evaluate):
+
2010-09-01 Dave Hyatt <hyatt at apple.com>
Reviewed by Dan Bernstein and Simon Fraser.
diff --git a/WebCore/inspector/front-end/ExtensionAPI.js b/WebCore/inspector/front-end/ExtensionAPI.js
index fd1df6e..64f5482 100644
--- a/WebCore/inspector/front-end/ExtensionAPI.js
+++ b/WebCore/inspector/front-end/ExtensionAPI.js
@@ -371,7 +371,7 @@ InspectedWindow.prototype = {
result.value = result.value === "undefined" ? undefined : JSON.parse(result.value);
callback(result);
}
- return extensionServer.sendRequest({ command: "evaluateOnInspectedPage", expression: expression }, callbackWrapper);
+ return extensionServer.sendRequest({ command: "evaluateOnInspectedPage", expression: expression }, callback && callbackWrapper);
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list