Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / http / tests / inspector / console-test.js

diff --git a/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js b/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
index 7516811..3b900b7 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
+++ b/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
@@ -22,10 +22,11 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
 {
     WebInspector.inspectorView.panel("console");
     var result = [];
-    var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages;
-    for (var i = 0; i < messageViews.length; ++i) {
-        var message = messageViews[i].consoleMessage();
-        var element = messageViews[i].toMessageElement();
+    var viewMessages = WebInspector.ConsolePanel._view()._visibleViewMessages;
+    for (var i = 0; i < viewMessages.length; ++i) {
+        var uiMessage = viewMessages[i];
+        var message = uiMessage.consoleMessage();
+        var element = uiMessage.contentElement();
 
         if (dumpClassNames) {
             var classNames = [];
@@ -35,26 +36,23 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
             }
         }
 
-        if (InspectorTest.dumpConsoleTableMessage(message)) {
+        if (InspectorTest.dumpConsoleTableMessage(uiMessage)) {
             if (dumpClassNames)
                 InspectorTest.addResult(classNames.join(" > "));
         } else {
-            var messageText = InspectorTest.prepareConsoleMessageText(element)
+            var messageText = InspectorTest.prepareConsoleMessageText(element);
             InspectorTest.addResult(messageText + (dumpClassNames ? " " + classNames.join(" > ") : ""));
         }
 
-        var uiMessage = messageViews[i];
-        if (printOriginatingCommand && uiMessage.originatingCommand) {
-            var originatingElement = uiMessage.originatingCommand.toMessageElement();
-            InspectorTest.addResult("Originating from: " + originatingElement.textContent.replace(/\u200b/g, ""));
-        }
+        if (printOriginatingCommand && uiMessage.consoleMessage().originatingMessage())
+            InspectorTest.addResult("Originating from: " + uiMessage.consoleMessage().originatingMessage().messageText);
     }
     return result;
 }
 
-InspectorTest.dumpConsoleTableMessage = function(message)
+InspectorTest.dumpConsoleTableMessage = function(viewMessage)
 {
-    var table = InspectorTest.toViewMessage(message).toMessageElement();
+    var table = viewMessage.contentElement();
     var headers = table.querySelectorAll("th div");
     if (!headers.length)
         return false;
@@ -86,7 +84,7 @@ InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages)
     var result = [];
     var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages;
     for (var i = 0; i < messageViews.length; ++i) {
-        var element = messageViews[i].toMessageElement();
+        var element = messageViews[i].contentElement();
         var messageText = InspectorTest.prepareConsoleMessageText(element)
         InspectorTest.addResult(messageText);
         var spans = element.querySelectorAll(".console-message-text > span > span");
@@ -100,8 +98,8 @@ InspectorTest.dumpConsoleMessagesWithClasses = function(sortMessages) {
     var result = [];
     var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages;
     for (var i = 0; i < messageViews.length; ++i) {
-        var element = messageViews[i].toMessageElement();
-        var messageText = InspectorTest.prepareConsoleMessageText(element)
+        var element = messageViews[i].contentElement();
+        var messageText = InspectorTest.prepareConsoleMessageText(element);
         result.push(messageText + " " + element.getAttribute("class"));
     }
     if (sortMessages)
@@ -116,7 +114,7 @@ InspectorTest.expandConsoleMessages = function(callback)
     var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages;
     for (var i = 0; i < messageViews.length; ++i) {
         var message = messageViews[i].consoleMessage();
-        var element = messageViews[i].toMessageElement();
+        var element = messageViews[i].contentElement();
         var node = element;
         while (node) {
             if (node.treeElementForTest)
@@ -168,4 +166,23 @@ InspectorTest.waitUntilNthMessageReceived = function(count, callback)
     InspectorTest.addSniffer(WebInspector.console, "addMessage", override, false);
 }
 
+InspectorTest.changeExecutionContext = function(namePrefix)
+{
+    WebInspector.inspectorView.panel("console");
+    var selector = WebInspector.ConsolePanel._view()._executionContextSelector._selectElement;
+    var option = selector.firstChild;
+    while (option) {
+        if (option.textContent && option.textContent.startsWith(namePrefix))
+            break;
+        option = option.nextSibling;
+    }
+    if (!option) {
+        InspectorTest.addResult("FAILED: context with prefix: "  + namePrefix + " not found in the context list");
+        return;
+    }
+    option.selected = true;
+    WebInspector.ConsolePanel._view()._executionContextChanged();
+}
+
+
 }