Changeset 58342 in webkit


Ignore:
Timestamp:
Apr 27, 2010 3:04:42 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-27 Eric Seidel <​eric@webkit.org>

Unreviewed, rolling out r58318.
​http://trac.webkit.org/changeset/58318
​https://bugs.webkit.org/show_bug.cgi?id=37215

Broke test on Tiger. Might just need updated results,
unclear.

  • http/tests/inspector/console-resource-errors-expected.txt: Removed.
  • http/tests/inspector/console-resource-errors.html: Removed.
  • http/tests/inspector/console-tests.js: Removed.
  • inspector/console-clear.html:
  • inspector/console-dir.html:
  • inspector/console-dirxml.html:
  • inspector/console-format-collections-expected.txt:
  • inspector/console-format-collections.html:
  • inspector/console-format.html:
  • inspector/console-log-before-inspector-open.html:
  • inspector/console-tests.html:
  • inspector/console-tests.js: Added. (dumpConsoleMessages.callback): (dumpConsoleMessages): (dumpConsoleMessagesWithClasses.callback): (dumpConsoleMessagesWithClasses): (frontend_dumpConsoleMessages):

2010-04-27 Eric Seidel <​eric@webkit.org>

Unreviewed, rolling out r58318.
​http://trac.webkit.org/changeset/58318
​https://bugs.webkit.org/show_bug.cgi?id=37215

Broke test on Tiger. Might just need updated results,
unclear.

  • inspector/InspectorController.cpp: (WebCore::InspectorController::didReceiveResponse): (WebCore::InspectorController::didFailLoading):
  • inspector/front-end/Resource.js: (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
  • inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
Location:
trunk
Files:
2 deleted
13 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r58341 r58342  
     12010-04-27  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r58318.
     4        http://trac.webkit.org/changeset/58318
     5        https://bugs.webkit.org/show_bug.cgi?id=37215
     6
     7        Broke test on Tiger.  Might just need updated results,
     8        unclear.
     9
     10        * http/tests/inspector/console-resource-errors-expected.txt: Removed.
     11        * http/tests/inspector/console-resource-errors.html: Removed.
     12        * http/tests/inspector/console-tests.js: Removed.
     13        * inspector/console-clear.html:
     14        * inspector/console-dir.html:
     15        * inspector/console-dirxml.html:
     16        * inspector/console-format-collections-expected.txt:
     17        * inspector/console-format-collections.html:
     18        * inspector/console-format.html:
     19        * inspector/console-log-before-inspector-open.html:
     20        * inspector/console-tests.html:
     21        * inspector/console-tests.js: Added.
     22        (dumpConsoleMessages.callback):
     23        (dumpConsoleMessages):
     24        (dumpConsoleMessagesWithClasses.callback):
     25        (dumpConsoleMessagesWithClasses):
     26        (frontend_dumpConsoleMessages):
     27
    1282010-04-27  Evan Martin  <evan@chromium.org>
    229

  • trunk/LayoutTests/inspector/console-clear.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-dir.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-dirxml.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-format-collections-expected.txt

    r58318 r58342  
    99
    1010console-format-collections.html:15[<select id="sel" name="sel">…</select>]
    11 console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js"></script>, <script src="../http/tests/inspector/console-tests.js"></script>, <script>…</script>]
     11console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js"></script>, <script src="console-tests.js"></script>, <script>…</script>]
    1212console-format-collections.html:23[<option value="1">one</option>, <option value="2">two</option>]
    13 console-format-collections.html:27[<html>…</html>, <head>…</head>, <script src="../http/tests/inspector/inspector-test.js"></script>, <script src="../http/tests/inspector/console-tests.js"></script>, <script>…</script>, <body onload="onload()">…</body>, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">…</div>, <form id="f">…</form>, <select id="sel" name="sel">…</select>, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output"></div>]
     13console-format-collections.html:27[<html>…</html>, <head>…</head>, <script src="../http/tests/inspector/inspector-test.js"></script>, <script src="console-tests.js"></script>, <script>…</script>, <body onload="onload()">…</body>, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">…</div>, <form id="f">…</form>, <select id="sel" name="sel">…</select>, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output"></div>]
    1414console-format-collections.html:31[<select id="sel" name="sel">…</select>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]
    1515console-format-collections.html:35[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]

  • trunk/LayoutTests/inspector/console-format-collections.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-format.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-log-before-inspector-open.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-tests.html

    r58318 r58342  
    22<head>
    33<script src="../http/tests/inspector/inspector-test.js"></script>
    4 <script src="../http/tests/inspector/console-tests.js"></script>
     4<script src="console-tests.js"></script>
    55<script>
    66

  • trunk/LayoutTests/inspector/console-tests.js

    • Property svn:executable set to *
    r58341 r58342  
    1212}
    1313
    14 function dumpConsoleMessagesWithClasses(sortMessages) {
     14function dumpConsoleMessagesWithClasses() {
    1515    function callback(result)
    1616    {
    17         var messages = [];
    1817        for (var i = 0; i < result.length; ++i)
    19             messages.push(result[i].text + " " + result[i].clazz);
    20         if (sortMessages)
    21             messages.sort();
    22         for (var i = 0; i < messages.length; ++i)
    23             output(messages[i]);
     18            output(result[i].text + " " + result[i].clazz);
    2419        notifyDone();
    2520    }

  • trunk/WebCore/ChangeLog

    r58341 r58342  
     12010-04-27  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r58318.
     4        http://trac.webkit.org/changeset/58318
     5        https://bugs.webkit.org/show_bug.cgi?id=37215
     6
     7        Broke test on Tiger.  Might just need updated results,
     8        unclear.
     9
     10        * inspector/InspectorController.cpp:
     11        (WebCore::InspectorController::didReceiveResponse):
     12        (WebCore::InspectorController::didFailLoading):
     13        * inspector/front-end/Resource.js:
     14        (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
     15        * inspector/front-end/ResourcesPanel.js:
     16        (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
     17
    1182010-04-27  Evan Martin  <evan@chromium.org>
    219

  • trunk/WebCore/inspector/InspectorController.cpp

    r58318 r58342  
    895895void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
    896896{
    897     if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
    898         resource->updateResponse(response);
    899         resource->markResponseReceivedTime();
    900 
    901         if (resource != m_mainResource && m_frontend)
    902             resource->updateScriptObject(m_frontend.get());
    903     }
    904     if (response.httpStatusCode() >= 400) {
    905         // The ugly code below is due to that String::format() is not utf8-safe at the moment.
    906         String message = String::format("Failed to load resource: the server responded with a status of %u (", response.httpStatusCode()) + response.httpStatusText() + ")";
    907 
    908         addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, response.url().string());
    909     }
     897    RefPtr<InspectorResource> resource = getTrackedResource(identifier);
     898    if (!resource)
     899        return;
     900
     901    resource->updateResponse(response);
     902    resource->markResponseReceivedTime();
     903
     904    if (resource != m_mainResource && m_frontend)
     905        resource->updateScriptObject(m_frontend.get());
    910906}
    911907
    … …  
    938934}
    939935
    940 void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& error)
     936void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/)
    941937{
    942938    if (m_timelineAgent)
    943939        m_timelineAgent->didFinishLoadingResource(identifier, true);
    944 
    945     String message = "Failed to load resource";
    946     if (!error.localizedDescription().isEmpty())
    947         message += ": " + error.localizedDescription();
    948     addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, error.failingURL());
    949940
    950941    RefPtr<InspectorResource> resource = getTrackedResource(identifier);

  • trunk/WebCore/inspector/front-end/Resource.js

    r58318 r58342  
    537537    _mimeTypeIsConsistentWithType: function()
    538538    {
    539         // If status is an error, content is likely to be of an inconsistent type,
    540         // as it's going to be an error message. We do not want to emit a warning
    541         // for this, though, as this will already be reported as resource loading failure.
    542         if (this.statusCode >= 400)
    543             return true;
    544 
    545539        if (typeof this.type === "undefined"
    546540         || this.type === WebInspector.Resource.Type.Other

  • trunk/WebCore/inspector/front-end/ResourcesPanel.js

    r58318 r58342  
    444444            return;
    445445
     446        resource.warnings = 0;
     447        resource.errors = 0;
     448
    446449        if (!this.currentQuery && resource._itemsTreeElement)
    447450            resource._itemsTreeElement.updateErrorsAndWarnings();
Note: See TracChangeset for help on using the changeset viewer.