| Index: third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
|
| index b6c59f2d726633c7726b8575a97f70a2498b7584..ba424db058696503b325b8028581c70645786f63 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
|
| +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
|
| @@ -107,7 +107,7 @@ InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, d
|
| for (var i = 0; i < viewMessages.length; ++i) {
|
| var uiMessage = viewMessages[i];
|
| var message = uiMessage.consoleMessage();
|
| - var element = uiMessage.contentElement();
|
| + var element = uiMessage.element();
|
|
|
| if (dumpClassNames) {
|
| var classNames = [];
|
| @@ -165,7 +165,7 @@ InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate, r
|
| {
|
| if (forceInvalidate)
|
| WebInspector.ConsoleView.instance()._viewport.invalidate();
|
| - var table = viewMessage.contentElement();
|
| + var table = viewMessage.element();
|
| var headers = table.querySelectorAll("th > div:first-child");
|
| if (!headers.length)
|
| return false;
|
| @@ -205,8 +205,8 @@ InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages)
|
| var result = [];
|
| var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages;
|
| for (var i = 0; i < messageViews.length; ++i) {
|
| - var element = messageViews[i].contentElement();
|
| - var messageText = InspectorTest.prepareConsoleMessageText(element)
|
| + var element = messageViews[i].element();
|
| + var messageText = InspectorTest.prepareConsoleMessageText(element);
|
| InspectorTest.addResult(messageText);
|
| var spans = element.querySelectorAll(".console-message-text > span *");
|
| for (var j = 0; j < spans.length; ++j)
|
| @@ -218,9 +218,10 @@ InspectorTest.dumpConsoleMessagesWithClasses = function(sortMessages) {
|
| var result = [];
|
| var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages;
|
| for (var i = 0; i < messageViews.length; ++i) {
|
| - var element = messageViews[i].contentElement();
|
| + var element = messageViews[i].element();
|
| + var contentElement = messageViews[i].contentElement();
|
| var messageText = InspectorTest.prepareConsoleMessageText(element);
|
| - result.push(messageText + " " + messageViews[i].toMessageElement().getAttribute("class") + " > " + element.getAttribute("class"));
|
| + result.push(messageText + " " + element.getAttribute("class") + " > " + contentElement.getAttribute("class"));
|
| }
|
| if (sortMessages)
|
| result.sort();
|
| @@ -250,14 +251,14 @@ InspectorTest.expandConsoleMessages = function(callback, deepFilter, sectionFilt
|
|
|
| // Initiate round-trips to fetch necessary data for further rendering.
|
| for (var i = 0; i < messageViews.length; ++i)
|
| - messageViews[i].contentElement();
|
| + messageViews[i].element();
|
|
|
| InspectorTest.deprecatedRunAfterPendingDispatches(expandTreeElements);
|
|
|
| function expandTreeElements()
|
| {
|
| for (var i = 0; i < messageViews.length; ++i) {
|
| - var element = messageViews[i].contentElement();
|
| + var element = messageViews[i].element();
|
| for (var node = element; node; node = node.traverseNextNode(element)) {
|
| if (node.treeElementForTest)
|
| node.treeElementForTest.expand();
|
| @@ -291,7 +292,7 @@ InspectorTest.expandGettersInConsoleMessages = function(callback)
|
| var propertiesCount = 0;
|
| InspectorTest.addSniffer(WebInspector.ObjectPropertyTreeElement.prototype, "_updateExpandable", propertyExpandableUpdated);
|
| for (var i = 0; i < messageViews.length; ++i) {
|
| - var element = messageViews[i].contentElement();
|
| + var element = messageViews[i].element();
|
| for (var node = element; node; node = node.traverseNextNode(element)) {
|
| if (node.classList && node.classList.contains("object-value-calculate-value-button")) {
|
| ++propertiesCount;
|
| @@ -319,7 +320,7 @@ InspectorTest.expandConsoleMessagesErrorParameters = function(callback)
|
| var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages;
|
| // Initiate round-trips to fetch necessary data for further rendering.
|
| for (var i = 0; i < messageViews.length; ++i)
|
| - messageViews[i].contentElement();
|
| + messageViews[i].element();
|
| InspectorTest.deprecatedRunAfterPendingDispatches(callback);
|
| }
|
|
|
|
|