Diff
Modified: tags/Safari-605.1.11.1/LayoutTests/ChangeLog (223637 => 223638)
--- tags/Safari-605.1.11.1/LayoutTests/ChangeLog 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/LayoutTests/ChangeLog 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,3 +1,22 @@
+2017-10-18 Jason Marcell <[email protected]>
+
+ Cherry-pick r223618. rdar://problem/35056300
+
+ 2017-10-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r223321.
+ https://bugs.webkit.org/show_bug.cgi?id=178476
+
+ This protocol change broke some internal builds (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: provide a way to enable/disable event
+ listeners"
+ https://bugs.webkit.org/show_bug.cgi?id=177451
+ https://trac.webkit.org/changeset/223321
+
2017-10-10 Yusuke Suzuki <[email protected]>
[JSC] __proto__ getter should be fast
Deleted: tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled-expected.txt (223637 => 223638)
--- tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled-expected.txt 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled-expected.txt 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,22 +0,0 @@
-Testing DOMAgent.setEventListenerDisabled.
-
-
-== Running test suite: DOM.setEventListenerDisabled
--- Running test case: DOM.setEventListenerDisabled.DisabledClickEvent
-Click event listener is enabled.
-Disabling event listener...
-<body> clicked.
-PASS: Click event listener did not fire.
-Click event listener is disabled.
-
--- Running test case: DOM.setEventListenerDisabled.ReenabledClickEvent
-Click event listener is disabled.
-Enabling event listener...
-<body> clicked.
-PASS: Click event listener fired.
-Click event listener is enabled.
-
--- Running test case: DOM.setEventListenerDisabled.Invalid
-PASS: Should produce an error.
-Error: No event listener for given identifier.
-
Deleted: tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled.html (223637 => 223638)
--- tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled.html 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/LayoutTests/inspector/dom/setEventListenerDisabled.html 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,129 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<script src=""
-<script>
-function clickBody() {
- document.body.click();
-
- TestPage.dispatchEventToFrontend("TestPageAfterClick");
-}
-
-function test() {
- let clickEventListener = null;
-
- let suite = InspectorTest.createAsyncSuite("DOM.setEventListenerDisabled");
-
- function logListener() {
- return DOMAgent.getEventListenersForNode(clickEventListener.nodeId).then(({listeners}) => {
- InspectorTest.assert(listeners.length === 1, "There should only be one event listener.");
- InspectorTest.assert(listeners[0].type === "click", `There event listener should be for "click".`);
- InspectorTest.log("Click event listener is " + (listeners[0].disabled ? "disabled" : "enabled") + ".");
- });
- }
-
- suite.addTestCase({
- name: "DOM.setEventListenerDisabled.DisabledClickEvent",
- test(resolve, reject) {
- let listener = InspectorTest.singleFireEventListener("TestPageDocumentClicked", () => {
- reject("Click event listener should not be called");
- });
-
- InspectorTest.singleFireEventListener("TestPageAfterClick", () => {
- InspectorTest.pass("Click event listener did not fire.");
-
- InspectorTest.removeEventListener(listener);
-
- logListener().then(resolve, reject);
- });
-
- logListener().then(() => {
- InspectorTest.log("Disabling event listener...");
-
- const disabled = true;
- DOMAgent.setEventListenerDisabled(clickEventListener.eventListenerId, disabled, (error) => {
- if (error) {
- reject(error);
- return;
- }
-
- InspectorTest.evaluateInPage(`clickBody()`, () => {
- InspectorTest.log("<body> clicked.");
- });
- });
- });
- }
- });
-
- suite.addTestCase({
- name: "DOM.setEventListenerDisabled.ReenabledClickEvent",
- test(resolve, reject) {
- InspectorTest.singleFireEventListener("TestPageDocumentClicked", () => {
- InspectorTest.pass("Click event listener fired.");
-
- logListener().then(resolve, reject);
- });
-
- logListener().then(() => {
- InspectorTest.log("Enabling event listener...");
-
- const disabled = false;
- DOMAgent.setEventListenerDisabled(clickEventListener.eventListenerId, disabled, (error) => {
- if (error) {
- reject(error);
- return;
- }
-
- InspectorTest.evaluateInPage(`clickBody()`, () => {
- InspectorTest.log("<body> clicked.");
- });
- });
- });
- }
- });
-
- suite.addTestCase({
- name: "DOM.setEventListenerDisabled.Invalid",
- description: "Invalid event listener identifiers should cause an error.",
- test(resolve, reject) {
- const invalidEventListenerId = 9999999;
- const disabled = false;
- DOMAgent.setEventListenerDisabled(invalidEventListenerId, disabled, (error) => {
- InspectorTest.expectThat(error, "Should produce an error.");
- InspectorTest.log("Error: " + error);
- resolve();
- });
- }
- });
-
- WI.domTreeManager.requestDocument((documentNode) => {
- DOMAgent.getEventListenersForNode(documentNode.id, (error, eventListeners) => {
- if (error) {
- InspectorTest.fail("Unable to retrieve event listeners.");
- InspectorTest.completeTest();
- return;
- }
-
- clickEventListener = eventListeners[0];
- if (!clickEventListener || clickEventListener.type !== "click") {
- InspectorTest.fail("Missing click event listener.");
- InspectorTest.completeTest();
- return;
- }
-
- suite.runTestCasesAndFinish();
- });
- });
-}
-</script>
-</head>
-<body _onload_="runTest()">
- <p>Testing DOMAgent.setEventListenerDisabled.</p>
-
- <script>
- document.addEventListener("click", (event) => {
- TestPage.dispatchEventToFrontend("TestPageDocumentClicked");
- });
- </script>
-</body>
-</html>
Modified: tags/Safari-605.1.11.1/Source/_javascript_Core/ChangeLog (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/_javascript_Core/ChangeLog 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/_javascript_Core/ChangeLog 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,3 +1,22 @@
+2017-10-18 Jason Marcell <[email protected]>
+
+ Cherry-pick r223618. rdar://problem/35056300
+
+ 2017-10-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r223321.
+ https://bugs.webkit.org/show_bug.cgi?id=178476
+
+ This protocol change broke some internal builds (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: provide a way to enable/disable event
+ listeners"
+ https://bugs.webkit.org/show_bug.cgi?id=177451
+ https://trac.webkit.org/changeset/223321
+
2017-10-10 Yusuke Suzuki <[email protected]>
[JSC] __proto__ getter should be fast
Modified: tags/Safari-605.1.11.1/Source/_javascript_Core/inspector/protocol/DOM.json (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/_javascript_Core/inspector/protocol/DOM.json 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/_javascript_Core/inspector/protocol/DOM.json 2017-10-18 23:09:56 UTC (rev 223638)
@@ -14,11 +14,6 @@
"description": "Unique DOM node identifier used to reference a node that may not have been pushed to the front-end."
},
{
- "id": "EventListenerId",
- "type": "integer",
- "description": "Unique event listener identifier."
- },
- {
"id": "PseudoType",
"type": "string",
"enum": ["before", "after"],
@@ -79,7 +74,6 @@
"type": "object",
"description": "A structure holding event listener properties.",
"properties": [
- { "name": "eventListenerId", "$ref": "EventListenerId" },
{ "name": "type", "type": "string", "description": "<code>EventListener</code>'s type." },
{ "name": "useCapture", "type": "boolean", "description": "<code>EventListener</code>'s useCapture." },
{ "name": "isAttribute", "type": "boolean", "description": "<code>EventListener</code>'s isAttribute." },
@@ -89,8 +83,7 @@
{ "name": "sourceName", "type": "string", "optional": true, "description": "Source script URL." },
{ "name": "handler", "$ref": "Runtime.RemoteObject", "optional": true, "description": "Event handler function value." },
{ "name": "passive", "type": "boolean", "optional": true, "description": "<code>EventListener</code>'s passive." },
- { "name": "once", "type": "boolean", "optional": true, "description": "<code>EventListener</code>'s once." },
- { "name": "disabled", "type": "boolean", "optional": true }
+ { "name": "once", "type": "boolean", "optional": true, "description": "<code>EventListener</code>'s once." }
]
},
{
@@ -266,14 +259,6 @@
]
},
{
- "name": "setEventListenerDisabled",
- "description": "Enable/disable the given event listener. A disabled event listener will not fire.",
- "parameters": [
- { "name": "eventListenerId", "$ref": "EventListenerId" },
- { "name": "disabled", "type": "boolean" }
- ]
- },
- {
"name": "getAccessibilityPropertiesForNode",
"description": "Returns a dictionary of accessibility properties for the node.",
"parameters": [
Modified: tags/Safari-605.1.11.1/Source/WebCore/ChangeLog (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/ChangeLog 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/ChangeLog 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,3 +1,22 @@
+2017-10-18 Jason Marcell <[email protected]>
+
+ Cherry-pick r223618. rdar://problem/35056300
+
+ 2017-10-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r223321.
+ https://bugs.webkit.org/show_bug.cgi?id=178476
+
+ This protocol change broke some internal builds (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: provide a way to enable/disable event
+ listeners"
+ https://bugs.webkit.org/show_bug.cgi?id=177451
+ https://trac.webkit.org/changeset/223321
+
2017-10-17 Matthew Hanson <[email protected]>
Cherry-pick r223579. rdar://problem/35032527
Modified: tags/Safari-605.1.11.1/Source/WebCore/dom/EventTarget.cpp (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/dom/EventTarget.cpp 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/dom/EventTarget.cpp 2017-10-18 23:09:56 UTC (rev 223638)
@@ -278,9 +278,6 @@
if (event.eventPhase() == Event::BUBBLING_PHASE && registeredListener->useCapture())
continue;
- if (InspectorInstrumentation::isEventListenerDisabled(*this, event.type(), registeredListener->callback(), registeredListener->useCapture()))
- continue;
-
// If stopImmediatePropagation has been called, we just break out immediately, without
// handling any more events on this target.
if (event.immediatePropagationStopped())
Modified: tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.cpp (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-10-18 23:09:56 UTC (rev 223638)
@@ -486,7 +486,6 @@
{
m_documentNodeToIdMap.clear();
m_idToNode.clear();
- m_eventListenerEntries.clear();
releaseDanglingNodes();
m_childrenRequested.clear();
m_backendIdToNode.clear();
@@ -831,31 +830,12 @@
Vector<EventListenerInfo> eventInformation;
getEventListeners(node, eventInformation, true);
- auto addListener = [&] (RegisteredEventListener& listener, const EventListenerInfo& info) {
- int identifier = 0;
- bool disabled = false;
-
- auto it = m_eventListenerEntries.find(&listener.callback());
- if (it == m_eventListenerEntries.end()) {
- InspectorEventListener inspectorEventListener(m_lastEventListenerId++, *info.node, info.eventType, listener.useCapture());
- m_eventListenerEntries.add(&listener.callback(), inspectorEventListener);
-
- identifier = inspectorEventListener.identifier;
- disabled = inspectorEventListener.disabled;
- } else {
- identifier = it->value.identifier;
- disabled = it->value.disabled;
- }
-
- listenersArray->addItem(buildObjectForEventListener(listener, identifier, info.eventType, info.node, objectGroup, disabled));
- };
-
// Get Capturing Listeners (in this order)
size_t eventInformationLength = eventInformation.size();
for (auto& info : eventInformation) {
for (auto& listener : info.eventListenerVector) {
if (listener->useCapture())
- addListener(*listener, info);
+ listenersArray->addItem(buildObjectForEventListener(*listener, info.eventType, info.node, objectGroup));
}
}
@@ -864,7 +844,7 @@
const EventListenerInfo& info = eventInformation[i - 1];
for (auto& listener : info.eventListenerVector) {
if (!listener->useCapture())
- addListener(*listener, info);
+ listenersArray->addItem(buildObjectForEventListener(*listener, info.eventType, info.node, objectGroup));
}
}
}
@@ -901,18 +881,6 @@
}
}
-void InspectorDOMAgent::setEventListenerDisabled(ErrorString& errorString, int eventListenerId, bool disabled)
-{
- for (InspectorEventListener& inspectorEventListener : m_eventListenerEntries.values()) {
- if (inspectorEventListener.identifier == eventListenerId) {
- inspectorEventListener.disabled = disabled;
- return;
- }
- }
-
- errorString = ASCIILiteral("No event listener for given identifier.");
-}
-
void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties)
{
Node* node = assertNode(errorString, nodeId);
@@ -1586,7 +1554,7 @@
return WTFMove(pseudoElements);
}
-Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, int identifier, const AtomicString& eventType, Node* node, const String* objectGroupId, bool disabled)
+Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
{
Ref<EventListener> eventListener = registeredEventListener.callback();
@@ -1617,7 +1585,6 @@
}
auto value = Inspector::Protocol::DOM::EventListener::create()
- .setEventListenerId(identifier)
.setType(eventType)
.setUseCapture(registeredEventListener.useCapture())
.setIsAttribute(eventListener->isAttribute())
@@ -1643,8 +1610,6 @@
value->setPassive(true);
if (registeredEventListener.isOnce())
value->setOnce(true);
- if (disabled)
- value->setDisabled(disabled);
return value;
}
@@ -2255,7 +2220,7 @@
m_frontendDispatcher->didAddEventListener(nodeId);
}
-void InspectorDOMAgent::willRemoveEventListener(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture)
+void InspectorDOMAgent::willRemoveEventListener(EventTarget& target)
{
Node* node = target.toNode();
if (!node)
@@ -2265,34 +2230,9 @@
if (!nodeId)
return;
- bool listenerExists = false;
- for (const RefPtr<RegisteredEventListener>& item : node->eventListeners(eventType)) {
- if (item->callback() == listener && item->useCapture() == capture) {
- listenerExists = true;
- break;
- }
- }
-
- if (!listenerExists)
- return;
-
- m_eventListenerEntries.remove(&listener);
-
m_frontendDispatcher->willRemoveEventListener(nodeId);
}
-bool InspectorDOMAgent::isEventListenerDisabled(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture)
-{
- auto it = m_eventListenerEntries.find(&listener);
- if (it == m_eventListenerEntries.end())
- return false;
-
- if (!it->value.disabled)
- return false;
-
- return it->value.eventTarget.get() == &target && it->value.eventType == eventType && it->value.useCapture == capture;
-}
-
Node* InspectorDOMAgent::nodeForPath(const String& path)
{
// The path is of form "1,HTML,2,BODY,1,DIV"
Modified: tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.h (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.h 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorDOMAgent.h 2017-10-18 23:09:56 UTC (rev 223638)
@@ -123,7 +123,6 @@
void setOuterHTML(ErrorString&, int nodeId, const String& outerHTML) override;
void setNodeValue(ErrorString&, int nodeId, const String& value) override;
void getEventListenersForNode(ErrorString&, int nodeId, const WTF::String* const objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
- void setEventListenerDisabled(ErrorString&, int eventListenerId, bool disabled) override;
void getAccessibilityPropertiesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
void performSearch(ErrorString&, const String& whitespaceTrimmedQuery, const Inspector::InspectorArray* nodeIds, String* searchId, int* resultCount) override;
void getSearchResults(ErrorString&, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
@@ -169,8 +168,7 @@
void pseudoElementCreated(PseudoElement&);
void pseudoElementDestroyed(PseudoElement&);
void didAddEventListener(EventTarget&);
- void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);
- bool isEventListenerDisabled(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);
+ void willRemoveEventListener(EventTarget&);
// Callbacks that don't directly correspond to an instrumentation entry point.
void setDocument(Document*);
@@ -234,7 +232,7 @@
Ref<Inspector::Protocol::Array<String>> buildArrayForElementAttributes(Element*);
Ref<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> buildArrayForPseudoElements(const Element&, NodeToIdMap* nodesMap);
- Ref<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, int identifier, const AtomicString& eventType, Node*, const String* objectGroupId, bool disabled = false);
+ Ref<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*);
void processAccessibilityChildren(RefPtr<AccessibilityObject>&&, RefPtr<Inspector::Protocol::Array<int>>&&);
@@ -275,27 +273,6 @@
bool m_searchingForNode { false };
bool m_suppressAttributeModifiedEvent { false };
bool m_documentRequested { false };
-
- struct InspectorEventListener {
- int identifier { 1 };
- RefPtr<EventTarget> eventTarget;
- AtomicString eventType;
- bool useCapture { false };
- bool disabled { false };
-
- InspectorEventListener() { }
-
- InspectorEventListener(int identifier, EventTarget& eventTarget, const AtomicString& eventType, bool useCapture)
- : identifier(identifier)
- , eventTarget(&eventTarget)
- , eventType(eventType)
- , useCapture(useCapture)
- {
- }
- };
-
- HashMap<EventListener*, InspectorEventListener> m_eventListenerEntries;
- int m_lastEventListenerId { 1 };
};
} // namespace WebCore
Modified: tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.cpp (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-10-18 23:09:56 UTC (rev 223638)
@@ -327,16 +327,9 @@
if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
pageDebuggerAgent->willRemoveEventListener(target, eventType, listener, capture);
if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
- domAgent->willRemoveEventListener(target, eventType, listener, capture);
+ domAgent->willRemoveEventListener(target);
}
-bool InspectorInstrumentation::isEventListenerDisabledImpl(InstrumentingAgents& instrumentingAgents, EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture)
-{
- if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
- return domAgent->isEventListenerDisabled(target, eventType, listener, capture);
- return false;
-}
-
void InspectorInstrumentation::didPostMessageImpl(InstrumentingAgents& instrumentingAgents, const TimerBase& timer, JSC::ExecState& state)
{
if (PageDebuggerAgent* pageDebuggerAgent = instrumentingAgents.pageDebuggerAgent())
Modified: tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.h (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.h 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebCore/inspector/InspectorInstrumentation.h 2017-10-18 23:09:56 UTC (rev 223638)
@@ -146,7 +146,6 @@
static void didCallFunction(const InspectorInstrumentationCookie&, ScriptExecutionContext*);
static void didAddEventListener(EventTarget&, const AtomicString& eventType);
static void willRemoveEventListener(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);
- static bool isEventListenerDisabled(EventTarget&, const AtomicString& eventType, EventListener&, bool capture);
static InspectorInstrumentationCookie willDispatchEvent(Document&, const Event&, bool hasEventListeners);
static void didDispatchEvent(const InspectorInstrumentationCookie&);
static void willHandleEvent(ScriptExecutionContext&, const Event&, const RegisteredEventListener&);
@@ -324,7 +323,6 @@
static void didCallFunctionImpl(const InspectorInstrumentationCookie&, ScriptExecutionContext*);
static void didAddEventListenerImpl(InstrumentingAgents&, EventTarget&, const AtomicString& eventType);
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);
static void willHandleEventImpl(InstrumentingAgents&, const Event&, const RegisteredEventListener&);
static void didHandleEventImpl(InstrumentingAgents&);
@@ -689,14 +687,6 @@
willRemoveEventListenerImpl(*instrumentingAgents, target, eventType, listener, capture);
}
-inline bool InspectorInstrumentation::isEventListenerDisabled(EventTarget& target, const AtomicString& eventType, EventListener& listener, bool capture)
-{
- FAST_RETURN_IF_NO_FRONTENDS(false);
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(target.scriptExecutionContext()))
- return isEventListenerDisabledImpl(*instrumentingAgents, target, eventType, listener, capture);
- return false;
-}
-
inline void InspectorInstrumentation::didPostMessage(Frame& frame, TimerBase& timer, JSC::ExecState& state)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/ChangeLog (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/ChangeLog 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/ChangeLog 2017-10-18 23:09:56 UTC (rev 223638)
@@ -1,3 +1,22 @@
+2017-10-18 Jason Marcell <[email protected]>
+
+ Cherry-pick r223618. rdar://problem/35056300
+
+ 2017-10-18 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r223321.
+ https://bugs.webkit.org/show_bug.cgi?id=178476
+
+ This protocol change broke some internal builds (Requested by
+ brrian__ on #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: provide a way to enable/disable event
+ listeners"
+ https://bugs.webkit.org/show_bug.cgi?id=177451
+ https://trac.webkit.org/changeset/223321
+
2017-10-16 Nikita Vasilyev <[email protected]>
Web Inspector: Styles Redesign: apply syntax highlighting to property values
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-10-18 23:09:56 UTC (rev 223638)
@@ -293,7 +293,6 @@
localizedStrings["Direction"] = "Direction";
localizedStrings["Disable Breakpoint"] = "Disable Breakpoint";
localizedStrings["Disable Breakpoints"] = "Disable Breakpoints";
-localizedStrings["Disable Event Listener"] = "Disable Event Listener";
localizedStrings["Disable Program"] = "Disable Program";
localizedStrings["Disable all breakpoints (%s)"] = "Disable all breakpoints (%s)";
localizedStrings["Disable paint flashing"] = "Disable paint flashing";
@@ -359,13 +358,11 @@
localizedStrings["Enable Breakpoint"] = "Enable Breakpoint";
localizedStrings["Enable Breakpoints"] = "Enable Breakpoints";
localizedStrings["Enable Canvas Tab"] = "Enable Canvas Tab";
-localizedStrings["Enable Event Listener"] = "Enable Event Listener";
localizedStrings["Enable Layers Tab"] = "Enable Layers Tab";
localizedStrings["Enable Program"] = "Enable Program";
localizedStrings["Enable all breakpoints (%s)"] = "Enable all breakpoints (%s)";
localizedStrings["Enable breakpoints"] = "Enable breakpoints";
localizedStrings["Enable paint flashing"] = "Enable paint flashing";
-localizedStrings["Enabled"] = "Enabled";
localizedStrings["Encoded"] = "Encoded";
localizedStrings["Encoding"] = "Encoding";
localizedStrings["Enter Tag"] = "Enter Tag";
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2017-10-18 23:09:56 UTC (rev 223638)
@@ -526,11 +526,6 @@
DOMAgent.setInspectedNode(node.id, callback);
}
- setEventListenerDisabled(eventListenerId, disabled)
- {
- DOMAgent.setEventListenerDisabled(eventListenerId, disabled);
- }
-
_buildHighlightConfig(mode = "all")
{
let highlightConfig = {showInfo: mode === "all"};
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2017-10-18 23:09:56 UTC (rev 223638)
@@ -45,6 +45,16 @@
super.closed();
}
+ addEventListeners()
+ {
+ this.domNode.addEventListener(WI.DOMNode.Event.EventListenersChanged, this._eventListenersChanged, this);
+ }
+
+ removeEventListeners()
+ {
+ this.domNode.removeEventListener(WI.DOMNode.Event.EventListenersChanged, this._eventListenersChanged, this);
+ }
+
// Protected
initialLayout()
@@ -159,20 +169,6 @@
this._attributesDataGridRow.sizeDidChange();
}
- attached()
- {
- super.attached();
-
- WI.DOMNode.addEventListener(WI.DOMNode.Event.EventListenersChanged, this._eventListenersChanged, this);
- }
-
- detached()
- {
- WI.DOMNode.removeEventListener(WI.DOMNode.Event.EventListenersChanged, this._eventListenersChanged, this);
-
- super.detached();
- }
-
// Private
_accessibilitySupported()
@@ -757,8 +753,7 @@
_eventListenersChanged(event)
{
- if (event.target === this.domNode || event.target.isAncestor(this.domNode))
- this._refreshEventListeners();
+ this._refreshEventListeners();
}
_attributesChanged(event)
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/DetailsSectionSimpleRow.js 2017-10-18 23:09:56 UTC (rev 223638)
@@ -73,18 +73,12 @@
get label()
{
- return this._label;
+ return this._labelElement.textContent;
}
set label(label)
{
- this._label = label || "";
-
- if (this._label instanceof Node) {
- this._labelElement.removeChildren();
- this._labelElement.appendChild(this._label);
- } else
- this._labelElement.textContent = this._label;
+ this._labelElement.textContent = label;
}
get value()
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.css (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.css 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.css 2017-10-18 23:09:56 UTC (rev 223638)
@@ -28,9 +28,3 @@
overflow: hidden;
text-overflow: ellipsis;
}
-
-.event-listener-section > .content input[type="checkbox"] {
- width: 12px;
- height: 12px;
- margin: 0;
-}
Modified: tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.js (223637 => 223638)
--- tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.js 2017-10-18 23:09:49 UTC (rev 223637)
+++ tags/Safari-605.1.11.1/Source/WebInspectorUI/UserInterface/Views/EventListenerSectionGroup.js 2017-10-18 23:09:56 UTC (rev 223638)
@@ -52,9 +52,6 @@
if (this._eventListener.once)
rows.push(new WI.DetailsSectionSimpleRow(WI.UIString("Once"), WI.UIString("Yes")));
- if (DOMAgent.setEventListenerDisabled)
- rows.push(this._createDisabledToggleRow());
-
this.rows = rows;
}
@@ -107,34 +104,4 @@
fragment.append(linkElement, functionName);
return fragment;
}
-
- _createDisabledToggleRow()
- {
- let toggleElement = document.createElement("input");
- toggleElement.type = "checkbox";
- toggleElement.checked = !this._eventListener.disabled;
-
- let updateTitle = () => {
- if (this._eventListener.disabled)
- toggleElement.title = WI.UIString("Enable Event Listener");
- else
- toggleElement.title = WI.UIString("Disable Event Listener");
- };
-
- updateTitle();
-
- toggleElement.addEventListener("change", (event) => {
- this._eventListener.disabled = !toggleElement.checked;
- WI.domTreeManager.setEventListenerDisabled(this._eventListener.eventListenerId, this._eventListener.disabled);
- updateTitle();
- });
-
- let toggleLabel = document.createElement("span");
- toggleLabel.textContent = WI.UIString("Enabled");
- toggleLabel.addEventListener("click", (event) => {
- toggleElement.click();
- });
-
- return new WI.DetailsSectionSimpleRow(toggleLabel, toggleElement);
- }
};
