Upstream version 9.37.195.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 3b900b7..3f2a47f 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
@@ -18,10 +18,26 @@ InspectorTest.prepareConsoleMessageText = function(messageElement)
     return messageText;
 }
 
-InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassNames)
+InspectorTest.disableConsoleViewport = function()
+{
+    InspectorTest.fixConsoleViewportDimensions(600, 2000);
+}
+
+InspectorTest.fixConsoleViewportDimensions = function(width, height)
+{
+    var viewport = WebInspector.ConsolePanel._view()._viewport;
+    viewport.element.style.width = width + "px";
+    viewport.element.style.height = height + "px";
+    viewport.element.style.position = "absolute";
+    viewport.invalidate();
+}
+
+InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassNames, formatter)
 {
     WebInspector.inspectorView.panel("console");
+    formatter = formatter || InspectorTest.prepareConsoleMessageText;
     var result = [];
+    InspectorTest.disableConsoleViewport();
     var viewMessages = WebInspector.ConsolePanel._view()._visibleViewMessages;
     for (var i = 0; i < viewMessages.length; ++i) {
         var uiMessage = viewMessages[i];
@@ -36,11 +52,11 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
             }
         }
 
-        if (InspectorTest.dumpConsoleTableMessage(uiMessage)) {
+        if (InspectorTest.dumpConsoleTableMessage(uiMessage, false)) {
             if (dumpClassNames)
                 InspectorTest.addResult(classNames.join(" > "));
         } else {
-            var messageText = InspectorTest.prepareConsoleMessageText(element);
+            var messageText = formatter(element);
             InspectorTest.addResult(messageText + (dumpClassNames ? " " + classNames.join(" > ") : ""));
         }
 
@@ -50,8 +66,10 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
     return result;
 }
 
-InspectorTest.dumpConsoleTableMessage = function(viewMessage)
+InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate)
 {
+    if (forceInvalidate)
+        WebInspector.ConsolePanel._view()._viewport.invalidate();
     var table = viewMessage.contentElement();
     var headers = table.querySelectorAll("th div");
     if (!headers.length)
@@ -68,7 +86,7 @@ InspectorTest.dumpConsoleTableMessage = function(viewMessage)
     for (var i = 0; i < rows.length; i++) {
         var row = rows[i];
         var rowLine = "";
-        var items = row.querySelectorAll("td > div > span");
+        var items = row.querySelectorAll("td > span");
         for (var j = 0; j < items.length; j++)
             rowLine += items[j].textContent + " | ";
 
@@ -130,6 +148,14 @@ InspectorTest.expandConsoleMessages = function(callback)
         InspectorTest.runAfterPendingDispatches(callback);
 }
 
+InspectorTest.waitForRemoteObjectsConsoleMessages = function(callback)
+{
+    var messages = WebInspector.ConsolePanel._view()._visibleViewMessages;
+    for (var i = 0; i < messages.length; ++i)
+        messages[i].toMessageElement();
+    InspectorTest.runAfterPendingDispatches(callback);
+}
+
 InspectorTest.checkConsoleMessagesDontHaveParameters = function()
 {
     WebInspector.inspectorView.panel("console");