ChangeLog

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: Provide $event in the console when paused on an event listener

        https://bugs.webkit.org/show_bug.cgi?id=188672

        Reviewed by NOBODY (OOPS!).

        * inspector/InjectedScript.h:

        * inspector/InjectedScript.cpp:

        (Inspector::InjectedScript::setEventValue): Added.

        (Inspector::InjectedScript::clearEventValue): Added.

        * inspector/InjectedScriptManager.h:

        * inspector/InjectedScriptManager.cpp:

        (Inspector::InjectedScriptManager::clearEventValue): Added.

        * inspector/InjectedScriptSource.js:

        (WI.InjectedScript.prototype.setEventValue): Added.

        (WI.InjectedScript.prototype.clearEventValue): Added.

        (BasicCommandLineAPI):

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: allow breakpoints to be set for specific event listeners

Source/JavaScriptCore/inspector/InjectedScript.cpp

@@RefPtr<Protocol::Runtime::ObjectPreview> InjectedScript::previewValue(JSC::JSVal

    return BindingTraits<Protocol::Runtime::ObjectPreview>::runtimeCast(resultObject);

}

void InjectedScript::setEventValue(JSC::JSValue value)

{

    ASSERT(!hasNoValue());

    Deprecated::ScriptFunctionCall function(injectedScriptObject(), "setEventValue"_s, inspectorEnvironment()->functionCallHandler());

    function.appendArgument(value);

    makeCall(function);

}

void InjectedScript::clearEventValue()

{

    ASSERT(!hasNoValue());

    Deprecated::ScriptFunctionCall function(injectedScriptObject(), "clearEventValue"_s, inspectorEnvironment()->functionCallHandler());

    makeCall(function);

}

void InjectedScript::setExceptionValue(JSC::JSValue value)

{

    ASSERT(!hasNoValue());

Source/JavaScriptCore/inspector/InjectedScript.h

@@public:

    RefPtr<Protocol::Runtime::RemoteObject> wrapTable(JSC::JSValue table, JSC::JSValue columns) const;

    RefPtr<Protocol::Runtime::ObjectPreview> previewValue(JSC::JSValue) const;

    void setEventValue(JSC::JSValue);

    void clearEventValue();

    void setExceptionValue(JSC::JSValue);

    void clearExceptionValue();

Source/JavaScriptCore/inspector/InjectedScriptManager.cpp

@@void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)

        injectedScript.releaseObjectGroup(objectGroup);

}

void InjectedScriptManager::clearEventValue()

{

    for (auto& injectedScript : m_idToInjectedScript.values())

        injectedScript.clearEventValue();   

}

void InjectedScriptManager::clearExceptionValue()

{

    for (auto& injectedScript : m_idToInjectedScript.values())

Source/JavaScriptCore/inspector/InjectedScriptManager.h

@@public:

    int injectedScriptIdFor(JSC::ExecState*);

    InjectedScript injectedScriptForObjectId(const String& objectId);

    void releaseObjectGroup(const String& objectGroup);

63 void clearEventValue();

    void clearExceptionValue();

protected:

Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@let InjectedScript = class InjectedScript

        return RemoteObject.createObjectPreviewForValue(value, true);

    }

    setEventValue(value)

    {

        this._eventValue = value;

    }

    clearEventValue()

    {

        delete this._eventValue;

    }

    setExceptionValue(value)

    {

        this._exceptionValue = value;

@@function bind(func, thisObject, ...outerArgs)

function BasicCommandLineAPI(callFrame)

{

    this.$_ = injectedScript._lastResult;

1396 this.$event = injectedScript._eventValue;

    this.$exception = injectedScript._exceptionValue;

    // $1-$99

Source/WebCore/ChangeLog

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: Provide $event in the console when paused on an event listener

        https://bugs.webkit.org/show_bug.cgi?id=188672

        Reviewed by NOBODY (OOPS!).

        No new tests (OOPS!).

        * inspector/CommandLineAPIModuleSource.js:

        (CommandLineAPI):

        * inspector/InspectorInstrumentation.h:

        (WebCore::InspectorInstrumentation::willHandleEvent):

        * inspector/InspectorInstrumentation.cpp:

        (WebCore::InspectorInstrumentation::willHandleEventImpl):

        (WebCore::InspectorInstrumentation::didHandleEventImpl):

        * inspector/agents/InspectorDOMDebuggerAgent.cpp:

        * inspector/agents/InspectorDOMDebuggerAgent.h:

        (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):

        (WebCore::InspectorDOMDebuggerAgent::willHandleEvent):

        (WebCore::InspectorDOMDebuggerAgent::didHandleEvent): Added.

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: allow breakpoints to be set for specific event listeners

Source/WebCore/inspector/CommandLineAPIModuleSource.js

@@function bind(func, thisObject, ...outerArgs)

function CommandLineAPI(commandLineAPIImpl, callFrame)

{

    this.$_ = injectedScript._lastResult;

50 this.$event = injectedScript._eventValue;

    this.$exception = injectedScript._exceptionValue;

    // $0

Source/WebCore/inspector/InspectorInstrumentation.cpp

@@InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventImpl(I

    return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);

}

391 void InspectorInstrumentation::willHandleEventImpl(InstrumentingAgents& instrumentingAgents, ~~const~~ Event& event, const RegisteredEventListener& listener)

391void InspectorInstrumentation::willHandleEventImpl(InstrumentingAgents& instrumentingAgents, Event& event, const RegisteredEventListener& listener)

{

    if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())

        pageDebuggerAgent->willHandleEvent(listener);

@@void InspectorInstrumentation::didHandleEventImpl(InstrumentingAgents& instrumen

{

    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents.inspectorDebuggerAgent())

        debuggerAgent->didDispatchAsyncCall();

    if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents.inspectorDOMDebuggerAgent())

        domDebuggerAgent->didHandleEvent();

}

void InspectorInstrumentation::didDispatchEventImpl(const InspectorInstrumentationCookie& cookie)

Source/WebCore/inspector/InspectorInstrumentation.h

@@public:

    static bool isEventListenerDisabled(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);

    static InspectorInstrumentationCookie willDispatchEvent(Document&, const Event&, bool hasEventListeners);

    static void didDispatchEvent(const InspectorInstrumentationCookie&);

154 static void willHandleEvent(ScriptExecutionContext&, ~~const~~ Event&, const RegisteredEventListener&);

154 static void willHandleEvent(ScriptExecutionContext&, Event&, const RegisteredEventListener&);

    static void didHandleEvent(ScriptExecutionContext&);

    static InspectorInstrumentationCookie willDispatchEventOnWindow(Frame*, const Event&, DOMWindow&);

    static void didDispatchEventOnWindow(const InspectorInstrumentationCookie&);

@@private:

    static void willRemoveEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType, EventListener&, bool capture);

    static bool isEventListenerDisabledImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType, EventListener&, bool capture);

    static InspectorInstrumentationCookie willDispatchEventImpl(InstrumentingAgents&, Document&, const Event&, bool hasEventListeners);

337 static void willHandleEventImpl(InstrumentingAgents&, ~~const~~ Event&, const RegisteredEventListener&);

337 static void willHandleEventImpl(InstrumentingAgents&, Event&, const RegisteredEventListener&);

    static void didHandleEventImpl(InstrumentingAgents&);

    static void didDispatchEventImpl(const InspectorInstrumentationCookie&);

    static InspectorInstrumentationCookie willDispatchEventOnWindowImpl(InstrumentingAgents&, const Event&, DOMWindow&);

@@inline void InspectorInstrumentation::didDispatchEvent(const InspectorInstrument

        didDispatchEventImpl(cookie);

}

766 inline void InspectorInstrumentation::willHandleEvent(ScriptExecutionContext& context, ~~const~~ Event& event, const RegisteredEventListener& listener)

766inline void InspectorInstrumentation::willHandleEvent(ScriptExecutionContext& context, Event& event, const RegisteredEventListener& listener)

{

    FAST_RETURN_IF_NO_FRONTENDS(void());

    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))

Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp

#include "HTMLElement.h"

#include "InspectorDOMAgent.h"

#include "InstrumentingAgents.h"

40#include "JSEvent.h"

4041#include "RegisteredEventListener.h"

4142#include <JavaScriptCore/ContentSearchUtilities.h>

43#include <JavaScriptCore/InjectedScript.h>

44#include <JavaScriptCore/InjectedScriptManager.h>

#include <JavaScriptCore/InspectorFrontendDispatchers.h>

#include <JavaScriptCore/RegularExpression.h>

#include <wtf/JSONValues.h>

@@using namespace Inspector;

InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(WebAgentContext& context, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)

    : InspectorAgentBase("DOMDebugger"_s, context)

    , m_backendDispatcher(Inspector::DOMDebuggerBackendDispatcher::create(context.backendDispatcher, this))

74 , m_injectedScriptManager(context.injectedScriptManager)

    , m_domAgent(domAgent)

    , m_debuggerAgent(debuggerAgent)

{

@@void InspectorDOMDebuggerAgent::updateSubtreeBreakpoints(Node* node, uint32_t ro

        updateSubtreeBreakpoints(child, newRootMask, set);

}

367 void InspectorDOMDebuggerAgent::willHandleEvent(~~const~~ Event& event, const RegisteredEventListener& registeredEventListener)

371void InspectorDOMDebuggerAgent::willHandleEvent(Event& event, const RegisteredEventListener& registeredEventListener)

{

    bool shouldPause = m_debuggerAgent->pauseOnNextStatementEnabled() || m_eventListenerBreakpoints.contains(listenerEventCategoryType + event.type());

    if (!shouldPause && m_domAgent)

        shouldPause = m_domAgent->hasBreakpointForEventListener(*event.currentTarget(), event.type(), registeredEventListener.callback(), registeredEventListener.useCapture());

    auto& state = *event.target()->scriptExecutionContext()->execState();

    auto injectedScript = m_injectedScriptManager.injectedScriptFor(&state);

    ASSERT(!injectedScript.hasNoValue());

    {

        JSC::JSLockHolder lock(&state);

        injectedScript.setEventValue(toJS(&state, deprecatedGlobalObjectForPrototype(&state), event));

    }

    if (!shouldPause)

        return;

@@void InspectorDOMDebuggerAgent::willHandleEvent(const Event& event, const Regist

    m_debuggerAgent->schedulePauseOnNextStatement(Inspector::DebuggerFrontendDispatcher::Reason::EventListener, WTFMove(eventData));

}

void InspectorDOMDebuggerAgent::didHandleEvent()

{

    m_injectedScriptManager.clearEventValue();

}

void InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded(const String& eventName, bool synchronous)

{

    bool shouldPause = m_debuggerAgent->pauseOnNextStatementEnabled() || m_eventListenerBreakpoints.contains(instrumentationEventCategoryType + eventName);

Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.h

#include <wtf/JSONValues.h>

#include <wtf/text/WTFString.h>

namespace Inspector {

class InjectedScriptManager;

}

namespace WebCore {

class Element;

@@public:

    void willModifyDOMAttr(Element&);

    void willSendXMLHttpRequest(const String& url);

    void frameDocumentUpdated(Frame&);

78 void willHandleEvent(const Event&, const RegisteredEventListener&);

82 void willHandleEvent(Event&, const RegisteredEventListener&);

83 void didHandleEvent();

    void pauseOnNativeEventIfNeeded(const String& eventName, bool synchronous);

    void mainFrameDOMContentLoaded();

@@private:

    void removeBreakpoint(ErrorString&, const String& eventName);

    RefPtr<Inspector::DOMDebuggerBackendDispatcher> m_backendDispatcher;

105 Inspector::InjectedScriptManager& m_injectedScriptManager;

    InspectorDOMAgent* m_domAgent { nullptr };

    Inspector::InspectorDebuggerAgent* m_debuggerAgent { nullptr };

Source/WebInspectorUI/ChangeLog

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: Provide $event in the console when paused on an event listener

        https://bugs.webkit.org/show_bug.cgi?id=188672

        Reviewed by NOBODY (OOPS!).

        * UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js:

        (WI.JavaScriptRuntimeCompletionProvider.prototype.completionControllerCompletionsNeeded.receivedPropertyNames):

2018-08-16  Devin Rousso  <drousso@apple.com>

        Web Inspector: allow breakpoints to be set for specific event listeners

Source/WebInspectorUI/UserInterface/Controllers/JavaScriptRuntimeCompletionProvider.js

@@WI.JavaScriptRuntimeCompletionProvider = class JavaScriptRuntimeCompletionProvid

                var commandLineAPI = ["$", "$$", "$x", "dir", "dirxml", "keys", "values", "profile", "profileEnd", "monitorEvents", "unmonitorEvents", "inspect", "copy", "clear", "getEventListeners", "$0", "$_"];

                if (WI.debuggerManager.paused) {

                    let targetData = WI.debuggerManager.dataForTarget(WI.runtimeManager.activeExecutionContext.target);

224 if (targetData.pauseReason === WI.DebuggerManager.PauseReason.Exception)

                    if (targetData.pauseReason === WI.DebuggerManager.PauseReason.EventListener)

                        commandLineAPI.push("$event");

                    else if (targetData.pauseReason === WI.DebuggerManager.PauseReason.Exception)

                        commandLineAPI.push("$exception");

                }

                for (var i = 0; i < commandLineAPI.length; ++i)