Skip to content
Permalink
Browse files
2009-10-06 Kelly Norton <knorton@google.com>
        Reviewed by Timothy Hatcher.

        Fixes <https://bugs.webkit.org/show_bug.cgi?id=30028>
        Multiple calls to SetFrontendProxyObject can leave an InspectorTimelineAgent with an invalid
        InspectorFrontend.

        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::setFrontendProxyObject): Adds a check for an existing timeline agent.

Canonical link: https://commits.webkit.org/40763@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@49204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Oct 6, 2009
1 parent 4c1ec41 commit 80569bdad0220d14608f6b12af25e09c7e24f9a1
Showing with 12 additions and 1 deletion.
  1. +11 −0 WebCore/ChangeLog
  2. +1 −1 WebCore/inspector/InspectorController.cpp
@@ -1,3 +1,14 @@
2009-10-06 Kelly Norton <knorton@google.com>

Reviewed by Timothy Hatcher.

Fixes <https://bugs.webkit.org/show_bug.cgi?id=30028>
Multiple calls to SetFrontendProxyObject can leave an InspectorTimelineAgent with an invalid
InspectorFrontend.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::setFrontendProxyObject): Adds a check for an existing timeline agent.

2009-10-06 Antti Koivisto <antti@apple.com>

Reviewed by Dave Kilzer.
@@ -553,7 +553,7 @@ void InspectorController::setFrontendProxyObject(ScriptState* scriptState, Scrip
m_domAgent = new InspectorDOMAgent(m_frontend.get());

Setting timelineEnabled = setting(timelineEnabledSettingName);
if (timelineEnabled.type() == Setting::BooleanType && timelineEnabled.booleanValue())
if (m_timelineAgent.get() || (timelineEnabled.type() == Setting::BooleanType && timelineEnabled.booleanValue()))
m_timelineAgent = new InspectorTimelineAgent(m_frontend.get());
}

0 comments on commit 80569bd

Please sign in to comment.