Skip to content

Commit 5353cc3

Browse files
Web Inspector: JSGlobalRuntimeAgent unintentionally overrides InspectorRuntimeAgent destruction handling
https://bugs.webkit.org/show_bug.cgi?id=149537 Patch by Joseph Pecoraro <[email protected]> on 2015-09-28 Reviewed by Darin Adler. * inspector/agents/JSGlobalObjectRuntimeAgent.h: * inspector/agents/JSGlobalObjectRuntimeAgent.cpp: (Inspector::JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend): Deleted. Do not override method, super class implementation is sufficient. * JavaScriptCore.xcodeproj/project.pbxproj: Fix file ordering. * inspector/agents/InspectorDebuggerAgent.h: Remove unused member variable. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@190301 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent e984a65 commit 5353cc3

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

Source/JavaScriptCore/ChangeLog

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2015-09-28 Joseph Pecoraro <[email protected]>
2+
3+
Web Inspector: JSGlobalRuntimeAgent unintentionally overrides InspectorRuntimeAgent destruction handling
4+
https://bugs.webkit.org/show_bug.cgi?id=149537
5+
6+
Reviewed by Darin Adler.
7+
8+
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
9+
* inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
10+
(Inspector::JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend): Deleted.
11+
Do not override method, super class implementation is sufficient.
12+
13+
* JavaScriptCore.xcodeproj/project.pbxproj:
14+
Fix file ordering.
15+
16+
* inspector/agents/InspectorDebuggerAgent.h:
17+
Remove unused member variable.
18+
119
2015-09-28 [email protected] <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
220

321
[ES6] Implement tail calls in the FTL

Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ class JS_EXPORT_PRIVATE InspectorDebuggerAgent : public InspectorAgentBase, publ
173173
bool m_javaScriptPauseScheduled { false };
174174
bool m_hasExceptionValue { false };
175175
bool m_didPauseStopwatch { false };
176-
RefPtr<WTF::Stopwatch> m_stopwatch;
177176
};
178177

179178
} // namespace Inspector

Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ void JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend(FrontendRouter*, Ba
4646
{
4747
}
4848

49-
void JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend(DisconnectReason)
50-
{
51-
}
52-
5349
VM& JSGlobalObjectRuntimeAgent::globalVM()
5450
{
5551
return m_globalObject.vm();

Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class JSGlobalObjectRuntimeAgent final : public InspectorRuntimeAgent {
3939
JSGlobalObjectRuntimeAgent(JSAgentContext&);
4040

4141
virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
42-
virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
4342

4443
virtual JSC::VM& globalVM() override;
4544
virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;

0 commit comments

Comments
 (0)