Changeset 57068 in webkit


Ignore:
Timestamp:
Apr 5, 2010 4:59:01 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-05 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Remove logging of successful XHR and worker's importScript()
to inspector console
​https://bugs.webkit.org/show_bug.cgi?id=37078

  • bindings/js/JSWorkerContextCustom.cpp: (WebCore::JSWorkerContext::importScripts):
  • bindings/v8/custom/V8WorkerContextCustom.cpp: (WebCore::V8WorkerContext::importScriptsCallback):
  • workers/DedicatedWorkerContext.cpp: (WebCore::DedicatedWorkerContext::importScripts):
  • workers/DedicatedWorkerContext.h:
  • workers/WorkerContext.cpp: (WebCore::WorkerContext::importScripts):
  • workers/WorkerContext.h:
  • xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::didFinishLoading):
Location:
trunk/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57064 r57068  
     12010-04-05  Andrey Kosyakov  <caseq@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Remove logging of successful XHR and worker's importScript()
     6        to inspector console
     7        https://bugs.webkit.org/show_bug.cgi?id=37078
     8
     9        * bindings/js/JSWorkerContextCustom.cpp:
     10        (WebCore::JSWorkerContext::importScripts):
     11        * bindings/v8/custom/V8WorkerContextCustom.cpp:
     12        (WebCore::V8WorkerContext::importScriptsCallback):
     13        * workers/DedicatedWorkerContext.cpp:
     14        (WebCore::DedicatedWorkerContext::importScripts):
     15        * workers/DedicatedWorkerContext.h:
     16        * workers/WorkerContext.cpp:
     17        (WebCore::WorkerContext::importScripts):
     18        * workers/WorkerContext.h:
     19        * xml/XMLHttpRequest.cpp:
     20        (WebCore::XMLHttpRequest::didFinishLoading):
     21
    1222010-04-04  Pavel Feldman  <pfeldman@chromium.org>
    223

  • trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp

    r54835 r57068  
    111111    }
    112112    ExceptionCode ec = 0;
    113     int signedLineNumber;
    114     intptr_t sourceID;
    115     UString sourceURL;
    116     JSValue function;
    117     exec->interpreter()->retrieveLastCaller(exec, signedLineNumber, sourceID, sourceURL, function);
    118113
    119     impl()->importScripts(urls, sourceURL, signedLineNumber >= 0 ? signedLineNumber : 0, ec);
     114    impl()->importScripts(urls, ec);
    120115    setDOMException(exec, ec);
    121116    return jsUndefined();

  • trunk/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp

    r56131 r57068  
    9191        return v8::Undefined();
    9292
    93     String callerURL;
    94     if (!V8Proxy::sourceName(callerURL))
    95         return v8::Undefined();
    96     int callerLine;
    97     if (!V8Proxy::sourceLineNumber(callerLine))
    98         return v8::Undefined();
    99     callerLine += 1;
    100 
    10193    Vector<String> urls;
    10294    for (int i = 0; i < args.Length(); i++) {
    … …  
    111103
    112104    ExceptionCode ec = 0;
    113     workerContext->importScripts(urls, callerURL, callerLine, ec);
     105    workerContext->importScripts(urls, ec);
    114106
    115107    if (ec)

  • trunk/WebCore/workers/DedicatedWorkerContext.cpp

    r49214 r57068  
    7272}
    7373
    74 void DedicatedWorkerContext::importScripts(const Vector<String>& urls, const String& callerURL, int callerLine, ExceptionCode& ec)
     74void DedicatedWorkerContext::importScripts(const Vector<String>& urls, ExceptionCode& ec)
    7575{
    76     Base::importScripts(urls, callerURL, callerLine, ec);
     76    Base::importScripts(urls, ec);
    7777    thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity());
    7878}

  • trunk/WebCore/workers/DedicatedWorkerContext.h

    r49214 r57068  
    5252
    5353        // Overridden to allow us to check our pending activity after executing imported script.
    54         virtual void importScripts(const Vector<String>& urls, const String& callerURL, int callerLine, ExceptionCode&);
     54        virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
    5555
    5656        // EventTarget

  • trunk/WebCore/workers/WorkerContext.cpp

    r55823 r57068  
    189189}
    190190
    191 void WorkerContext::importScripts(const Vector<String>& urls, const String& callerURL, int callerLine, ExceptionCode& ec)
    192 {
    193 #if !ENABLE(INSPECTOR)
    194     UNUSED_PARAM(callerURL);
    195     UNUSED_PARAM(callerLine);
    196 #endif
     191void WorkerContext::importScripts(const Vector<String>& urls, ExceptionCode& ec)
     192{
    197193    ec = 0;
    198194    Vector<String>::const_iterator urlsEnd = urls.end();
    … …  
    219215
    220216        scriptExecutionContext()->scriptImported(scriptLoader.identifier(), scriptLoader.script());
    221 #if ENABLE(INSPECTOR)
    222         scriptExecutionContext()->addMessage(InspectorControllerDestination, JSMessageSource, LogMessageType, LogMessageLevel, "Worker script imported: \"" + *it + "\".", callerLine, callerURL);
    223 #endif
    224217
    225218        ScriptValue exception;

  • trunk/WebCore/workers/WorkerContext.h

    r55823 r57068  
    8989
    9090        // WorkerUtils
    91         virtual void importScripts(const Vector<String>& urls, const String& callerURL, int callerLine, ExceptionCode&);
     91        virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
    9292        WorkerNavigator* navigator() const;
    9393

  • trunk/WebCore/xml/XMLHttpRequest.cpp

    r56825 r57068  
    873873
    874874    scriptExecutionContext()->resourceRetrievedByXMLHttpRequest(identifier, m_responseText);
    875 #if ENABLE(INSPECTOR)
    876     scriptExecutionContext()->addMessage(InspectorControllerDestination, JSMessageSource, LogMessageType, LogMessageLevel, "XHR finished loading: \"" + m_url + "\".", m_lastSendLineNumber, m_lastSendURL);
    877 #endif
    878875
    879876    bool hadLoader = m_loader;
Note: See TracChangeset for help on using the changeset viewer.