[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit e4d6c649f6ba88414d20f5ebc6d13b4e6681651a
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 11:39:52 2011 +0000

    2011-01-26  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: inspector tests fix.
    
            * http/tests/inspector/inspector-test2.js:
            (initialize_InspectorTest.InspectorTest.evaluateInPage):
            * inspector/console-format.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c5f7883..eb45936 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-26  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: inspector tests fix.
+
+        * http/tests/inspector/inspector-test2.js:
+        (initialize_InspectorTest.InspectorTest.evaluateInPage):
+        * inspector/console-format.html:
+
 2011-01-26  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Unreviewed, unskip passing canvas tests in GTK port.
diff --git a/LayoutTests/http/tests/inspector/extensions-test.js b/LayoutTests/http/tests/inspector/extensions-test.js
index 311c429..c5c4549 100644
--- a/LayoutTests/http/tests/inspector/extensions-test.js
+++ b/LayoutTests/http/tests/inspector/extensions-test.js
@@ -34,7 +34,7 @@ InspectorTest.dispatchOnMessage = function(messageId, callback, recurring)
 
 InspectorTest.runExtensionTests = function()
 {
-    InspectorBackend.evaluate("location.href", "console", function(result) {
+    InspectorBackend.evaluate("location.href", "console", false, function(result) {
         var pageURL = result.description;
         var extensionURL = (/^https?:/.test(pageURL) ?
             pageURL.replace(/^(https?:\/\/[^/]*\/).*$/,"$1") :
diff --git a/LayoutTests/http/tests/inspector/inspector-test2.js b/LayoutTests/http/tests/inspector/inspector-test2.js
index f1982c8..6196e89 100644
--- a/LayoutTests/http/tests/inspector/inspector-test2.js
+++ b/LayoutTests/http/tests/inspector/inspector-test2.js
@@ -24,7 +24,7 @@ InspectorTest.evaluateInConsole = function(code, callback)
 
 InspectorTest.evaluateInPage = function(code, callback)
 {
-    InspectorBackend.evaluate(code, "console", callback || function() {});
+    InspectorBackend.evaluate(code, "console", false, callback || function() {});
 }
 
 InspectorTest.evaluateInPageWithTimeout = function(code, callback)
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion.html b/LayoutTests/http/tests/inspector/resource-har-conversion.html
index 9c58fd2..bdf0f3f 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion.html
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion.html
@@ -26,7 +26,7 @@ var test = function()
     }
 
     InspectorTest.reloadPageIfNeeded(function() {
-        InspectorBackend.evaluate("doXHR()", "console", function() {
+        InspectorBackend.evaluate("doXHR()", "console", false, function() {
             addCookieHeadersToResource(findResourceByURL(/inspector-test2\.js$/));
             var entries = (new WebInspector.HARLog()).build().entries;
             entries.sort(InspectorTest.resourceURLComparer);
diff --git a/LayoutTests/inspector/console-command-clear.html b/LayoutTests/inspector/console-command-clear.html
index f870ec9..639b0b4 100644
--- a/LayoutTests/inspector/console-command-clear.html
+++ b/LayoutTests/inspector/console-command-clear.html
@@ -17,7 +17,7 @@ function doit()
         output("=== After clear ==="); 
         dumpConsoleMessages();
     }
-    evaluateInWebInspector("InspectorBackend.evaluate('clear()', '', function() {})", callback);
+    evaluateInWebInspector("InspectorBackend.evaluate('clear()', '', true, function() {})", callback);
 }
 
 </script>
diff --git a/LayoutTests/inspector/console-dir-global.html b/LayoutTests/inspector/console-dir-global.html
index 76e6ccb..68850cd 100644
--- a/LayoutTests/inspector/console-dir-global.html
+++ b/LayoutTests/inspector/console-dir-global.html
@@ -22,7 +22,7 @@ function frontend_expandAndDumpConsoleMessages(testController)
     // Need test to be async to expand console objects.
     testController.waitUntilDone();
 
-    InspectorBackend.evaluate("window", "console", evalCallback);
+    InspectorBackend.evaluate("window", "console", false, evalCallback);
 
     function evalCallback(result)
     {
diff --git a/LayoutTests/inspector/console-format.html b/LayoutTests/inspector/console-format.html
index c34eecb..e3427dd 100755
--- a/LayoutTests/inspector/console-format.html
+++ b/LayoutTests/inspector/console-format.html
@@ -80,7 +80,7 @@ function frontend_evalExpression(expression)
         self.addMessage(new WebInspector.ConsoleCommandResult(result, expression));
     }
 
-    self.evalInInspectedWindow(expression, "console", printResult);
+    self.evalInInspectedWindow(expression, "console", false, printResult);
 }
 
 </script>
diff --git a/Source/WebCore/inspector/front-end/ExtensionPanel.js b/Source/WebCore/inspector/front-end/ExtensionPanel.js
index fb98350..144d55d 100644
--- a/Source/WebCore/inspector/front-end/ExtensionPanel.js
+++ b/Source/WebCore/inspector/front-end/ExtensionPanel.js
@@ -95,7 +95,7 @@ WebInspector.ExtensionWatchSidebarPane.prototype = {
 
     setExpression: function(expression, title)
     {
-        InspectorBackend.evaluate(expression, "extension-watch", this._onEvaluate.bind(this, title));
+        InspectorBackend.evaluate(expression, "extension-watch", false, this._onEvaluate.bind(this, title));
     },
 
     _onEvaluate: function(title, result)
diff --git a/Source/WebCore/inspector/front-end/ExtensionServer.js b/Source/WebCore/inspector/front-end/ExtensionServer.js
index 0924106..d85c1f8 100644
--- a/Source/WebCore/inspector/front-end/ExtensionServer.js
+++ b/Source/WebCore/inspector/front-end/ExtensionServer.js
@@ -272,7 +272,7 @@ WebInspector.ExtensionServer.prototype = {
         var evalExpression = "JSON.stringify(eval('" +
             "with (window.console._commandLineAPI) with (window) {' + unescape('" + escape(message.expression) +
             "') + '}'));";
-        InspectorBackend.evaluate(evalExpression, "none", callback.bind(this));
+        InspectorBackend.evaluate(evalExpression, "none", false, callback.bind(this));
     },
 
     _onRevealAndSelect: function(message)

-- 
WebKit Debian packaging