Changeset 240188 in webkit

Timestamp:

Jan 18, 2019 4:13:28 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Audit: don't keep the injected sub-objects alive between runs
​https://bugs.webkit.org/show_bug.cgi?id=193594
<rdar://problem/47398091>

Reviewed by Joseph Pecoraro.

Rather than save the InspectorAuditAccessibilityObject and InspectorAuditDOMObject
between individual Audit.setup invocations, we should only keep them alive so long as the
injected WebInspectorAudit object is alive (e.g. from Audit.setup to Audit.teardown).

This change fixes inspector/audit/run-accessibility.html.

• inspector/agents/page/PageAuditAgent.h:
• inspector/agents/page/PageAuditAgent.cpp:

(WebCore::PageAuditAgent::populateAuditObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/agents/page/PageAuditAgent.cpp (modified) (2 diffs)
• inspector/agents/page/PageAuditAgent.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-18  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: don't keep the injected sub-objects alive between runs
+        https://bugs.webkit.org/show_bug.cgi?id=193594
+        <rdar://problem/47398091>
+
+        Reviewed by Joseph Pecoraro.
+
+        Rather than save the `InspectorAuditAccessibilityObject` and `InspectorAuditDOMObject`
+        between individual `Audit.setup` invocations, we should only keep them alive so long as the
+        injected `WebInspectorAudit` object is alive (e.g. from `Audit.setup` to `Audit.teardown`).
+
+        This change fixes inspector/audit/run-accessibility.html.
+
+        * inspector/agents/page/PageAuditAgent.h:
+        * inspector/agents/page/PageAuditAgent.cpp:
+        (WebCore::PageAuditAgent::populateAuditObject):
+
 2019-01-18  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/inspector/agents/page/PageAuditAgent.cpp

@@ -27 +27 @@
 #include "PageAuditAgent.h"
 
+#include "InspectorAuditAccessibilityObject.h"
+#include "InspectorAuditDOMObject.h"
 #include "JSInspectorAuditAccessibilityObject.h"
 #include "JSInspectorAuditDOMObject.h"
@@ -82 +84 @@
         JSC::JSLockHolder lock(execState);
 
-#define ADD_AUDIT_OBJECT(name) \
-        if (!m_audit##name##Object) \
-            m_audit##name##Object = InspectorAudit##name##Object::create(*this); \
-        if (JSC::JSValue inspectorAudit##name##Object = toJS(execState, globalObject, *m_audit##name##Object)) \
-            auditObject->putDirect(execState->vm(), JSC::Identifier::fromString(execState, "" #name ""), inspectorAudit##name##Object);
+        if (JSC::JSValue jsInspectorAuditAccessibilityObject = toJSNewlyCreated(execState, globalObject, InspectorAuditAccessibilityObject::create(*this))) \
+            auditObject->putDirect(execState->vm(), JSC::Identifier::fromString(execState, "Accessibility"), jsInspectorAuditAccessibilityObject);
 
-        ADD_AUDIT_OBJECT(Accessibility);
-        ADD_AUDIT_OBJECT(DOM);
-#undef ADD_AUDIT_OBJECT
+        if (JSC::JSValue jsInspectorAuditDOMObject = toJSNewlyCreated(execState, globalObject, InspectorAuditDOMObject::create(*this))) \
+            auditObject->putDirect(execState->vm(), JSC::Identifier::fromString(execState, "DOM"), jsInspectorAuditDOMObject);
     }
 }

trunk/Source/WebCore/inspector/agents/page/PageAuditAgent.h

@@ -26 +26 @@
 #pragma once
 
-#include "InspectorAuditAccessibilityObject.h"
-#include "InspectorAuditDOMObject.h"
 #include "InspectorWebAgentBase.h"
 #include <JavaScriptCore/InspectorAuditAgent.h>
@@ -51 +49 @@
 
     Page& m_inspectedPage;
-    RefPtr<InspectorAuditAccessibilityObject> m_auditAccessibilityObject;
-    RefPtr<InspectorAuditDOMObject> m_auditDOMObject;
 };