Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / sdk / ConsoleModel.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js b/src/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
index 7fa16a7..e0f9139 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
@@ -152,18 +152,20 @@ WebInspector.ConsoleModel.evaluateCommandInConsole = function(executionContext,
      * @param {boolean} wasThrown
      * @param {?RuntimeAgent.RemoteObject=} valueResult
      * @param {?DebuggerAgent.ExceptionDetails=} exceptionDetails
-     * @this {WebInspector.ConsoleModel}
      */
     function printResult(result, wasThrown, valueResult, exceptionDetails)
     {
         if (!result)
             return;
 
-        WebInspector.console.show();
-        this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, {result: result, wasThrown: wasThrown, text: text, commandMessage: commandMessage, exceptionDetails: exceptionDetails});
+        WebInspector.console.showPromise().then(reportUponEvaluation).done();
+        function reportUponEvaluation()
+        {
+            target.consoleModel.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, {result: result, wasThrown: wasThrown, text: text, commandMessage: commandMessage, exceptionDetails: exceptionDetails});
+        }
     }
 
-    executionContext.evaluate(text, "console", useCommandLineAPI, false, false, true, printResult.bind(target.consoleModel));
+    executionContext.evaluate(text, "console", useCommandLineAPI, false, false, true, printResult);
 
     WebInspector.userMetrics.ConsoleEvaluated.record();
 }