Ignore:
Timestamp:
Feb 16, 2017, 10:49:40 AM (8 years ago)
Author:
Yusuke Suzuki
Message:

[JSC] Drop PassRefPtr in inspector/
​https://bugs.webkit.org/show_bug.cgi?id=168420

Reviewed by Alex Christensen.

Source/JavaScriptCore:

Drop PassRefPtr uses.
And use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
It drops some unnecessary null checks.

  • debugger/Debugger.cpp:

(JSC::Debugger::hasBreakpoint):
(JSC::Debugger::currentDebuggerCallFrame):

  • debugger/Debugger.h:
  • inspector/AsyncStackTrace.cpp:

(Inspector::AsyncStackTrace::create):
(Inspector::AsyncStackTrace::AsyncStackTrace):
(Inspector::AsyncStackTrace::buildInspectorObject):
(Inspector::AsyncStackTrace::truncate):

  • inspector/AsyncStackTrace.h:
  • inspector/ConsoleMessage.cpp:

(Inspector::ConsoleMessage::ConsoleMessage):

  • inspector/ConsoleMessage.h:
  • inspector/InjectedScriptManager.cpp:

(Inspector::InjectedScriptManager::InjectedScriptManager):
(Inspector::InjectedScriptManager::injectedScriptHost):

  • inspector/InjectedScriptManager.h:
  • inspector/JSGlobalObjectConsoleClient.cpp:

(Inspector::JSGlobalObjectConsoleClient::messageWithTypeAndLevel):
(Inspector::JSGlobalObjectConsoleClient::count):
(Inspector::JSGlobalObjectConsoleClient::timeEnd):
(Inspector::JSGlobalObjectConsoleClient::timeStamp):
(Inspector::JSGlobalObjectConsoleClient::warnUnimplemented):

  • inspector/JSGlobalObjectConsoleClient.h:

ConsoleClient now takes Ref<ScriptArgument>&& instead of RefPtr<ScriptArgument>&&.

  • inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):
(Inspector::JSGlobalObjectInspectorController::reportAPIException):

  • inspector/JSGlobalObjectInspectorController.h:
  • inspector/JSJavaScriptCallFrame.cpp:

(Inspector::JSJavaScriptCallFrame::JSJavaScriptCallFrame):
(Inspector::toJS):

  • inspector/JSJavaScriptCallFrame.h:

(Inspector::JSJavaScriptCallFrame::create):

  • inspector/JavaScriptCallFrame.cpp:

(Inspector::JavaScriptCallFrame::JavaScriptCallFrame):
(Inspector::JavaScriptCallFrame::caller):

  • inspector/JavaScriptCallFrame.h:

(Inspector::JavaScriptCallFrame::create):

  • inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::evaluateBreakpointAction):
(Inspector::ScriptDebugServer::dispatchDidPause):
(Inspector::ScriptDebugServer::exceptionOrCaughtValue):

  • inspector/agents/InspectorConsoleAgent.cpp:

(Inspector::InspectorConsoleAgent::stopTiming):
(Inspector::InspectorConsoleAgent::count):

  • inspector/agents/InspectorConsoleAgent.h:
  • inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::didScheduleAsyncCall):

  • runtime/ConsoleClient.cpp:

(JSC::ConsoleClient::printConsoleMessageWithArguments):
(JSC::ConsoleClient::internalMessageWithTypeAndLevel):
(JSC::ConsoleClient::logWithLevel):
(JSC::ConsoleClient::dir):
(JSC::ConsoleClient::dirXML):
(JSC::ConsoleClient::table):
(JSC::ConsoleClient::trace):
(JSC::ConsoleClient::assertion):
(JSC::ConsoleClient::group):
(JSC::ConsoleClient::groupCollapsed):
(JSC::ConsoleClient::groupEnd):

  • runtime/ConsoleClient.h:
  • runtime/ConsoleObject.cpp:

(JSC::consoleLogWithLevel):
(JSC::consoleProtoFuncDir):
(JSC::consoleProtoFuncDirXML):
(JSC::consoleProtoFuncTable):
(JSC::consoleProtoFuncTrace):
(JSC::consoleProtoFuncAssert):
(JSC::consoleProtoFuncCount):
(JSC::consoleProtoFuncTimeStamp):
(JSC::consoleProtoFuncGroup):
(JSC::consoleProtoFuncGroupCollapsed):
(JSC::consoleProtoFuncGroupEnd):

Source/WebCore:

Use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
It drops some unnecessary null checks.

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateCallWith):

  • bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStackCaller):

  • dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::PendingException::PendingException):

  • inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::consoleCountImpl):
(WebCore::InspectorInstrumentation::stopConsoleTimingImpl):
(WebCore::InspectorInstrumentation::consoleTimeStampImpl):

  • inspector/InspectorInstrumentation.h:

(WebCore::InspectorInstrumentation::consoleCount):
(WebCore::InspectorInstrumentation::stopConsoleTiming):
(WebCore::InspectorInstrumentation::consoleTimeStamp):

  • inspector/InspectorNetworkAgent.cpp:

(WebCore::InspectorNetworkAgent::buildInitiatorObject):

  • inspector/TimelineRecordFactory.cpp:

(WebCore::TimelineRecordFactory::createGenericRecord):

  • inspector/WebInjectedScriptManager.cpp:

(WebCore::WebInjectedScriptManager::WebInjectedScriptManager):

  • inspector/WebInjectedScriptManager.h:
  • page/DOMWindow.cpp:

(WebCore::DOMWindow::postMessageTimerFired):
We dispatch appropriate addMessage function according to whether
timer.stackTrace() is nullptr.

  • page/PageConsoleClient.cpp:

(WebCore::PageConsoleClient::addMessage):
(WebCore::PageConsoleClient::messageWithTypeAndLevel):
(WebCore::PageConsoleClient::count):
(WebCore::PageConsoleClient::timeEnd):
(WebCore::PageConsoleClient::timeStamp):

  • page/PageConsoleClient.h:
  • workers/WorkerConsoleClient.cpp:

(WebCore::WorkerConsoleClient::messageWithTypeAndLevel):
(WebCore::WorkerConsoleClient::count):
(WebCore::WorkerConsoleClient::timeEnd):
(WebCore::WorkerConsoleClient::timeStamp):

  • workers/WorkerConsoleClient.h:
  • workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::addMessage):

Source/WebKit/mac:

  • WebView/WebScriptDebugger.mm:

(WebScriptDebugger::handlePause):

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp

    r211247 r212448  
    111111        return JSValue::encode(jsUndefined());
    112112
    113     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    114     client->logWithLevel(exec, WTFMove(arguments), level);
     113    client->logWithLevel(exec, Inspector::createScriptArguments(exec, 0), level);
    115114    return JSValue::encode(jsUndefined());
    116115}
    … …  
    157156        return JSValue::encode(jsUndefined());
    158157
    159     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    160     client->dir(exec, WTFMove(arguments));
     158    client->dir(exec, Inspector::createScriptArguments(exec, 0));
    161159    return JSValue::encode(jsUndefined());
    162160}
    … …  
    168166        return JSValue::encode(jsUndefined());
    169167
    170     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    171     client->dirXML(exec, WTFMove(arguments));
     168    client->dirXML(exec, Inspector::createScriptArguments(exec, 0));
    172169    return JSValue::encode(jsUndefined());
    173170}
    … …  
    179176        return JSValue::encode(jsUndefined());
    180177
    181     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    182     client->table(exec, WTFMove(arguments));
     178    client->table(exec, Inspector::createScriptArguments(exec, 0));
    183179    return JSValue::encode(jsUndefined());
    184180}
    … …  
    190186        return JSValue::encode(jsUndefined());
    191187
    192     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    193     client->trace(exec, WTFMove(arguments));
     188    client->trace(exec, Inspector::createScriptArguments(exec, 0));
    194189    return JSValue::encode(jsUndefined());
    195190}
    … …  
    209204        return JSValue::encode(jsUndefined());
    210205
    211     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 1));
    212     client->assertion(exec, WTFMove(arguments));
     206    client->assertion(exec, Inspector::createScriptArguments(exec, 1));
    213207    return JSValue::encode(jsUndefined());
    214208}
    … …  
    220214        return JSValue::encode(jsUndefined());
    221215
    222     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    223     client->count(exec, WTFMove(arguments));
     216    client->count(exec, Inspector::createScriptArguments(exec, 0));
    224217    return JSValue::encode(jsUndefined());
    225218}
    … …  
    341334        return JSValue::encode(jsUndefined());
    342335
    343     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    344     client->timeStamp(exec, WTFMove(arguments));
     336    client->timeStamp(exec, Inspector::createScriptArguments(exec, 0));
    345337    return JSValue::encode(jsUndefined());
    346338}
    … …  
    352344        return JSValue::encode(jsUndefined());
    353345
    354     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    355     client->group(exec, WTFMove(arguments));
     346    client->group(exec, Inspector::createScriptArguments(exec, 0));
    356347    return JSValue::encode(jsUndefined());
    357348}
    … …  
    363354        return JSValue::encode(jsUndefined());
    364355
    365     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    366     client->groupCollapsed(exec, WTFMove(arguments));
     356    client->groupCollapsed(exec, Inspector::createScriptArguments(exec, 0));
    367357    return JSValue::encode(jsUndefined());
    368358}
    … …  
    374364        return JSValue::encode(jsUndefined());
    375365
    376     RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
    377     client->groupEnd(exec, WTFMove(arguments));
     366    client->groupEnd(exec, Inspector::createScriptArguments(exec, 0));
    378367    return JSValue::encode(jsUndefined());
    379368}
Note: See TracChangeset for help on using the changeset viewer.