Changeset 49204 in webkit


Ignore:
Timestamp:
Oct 6, 2009 12:56:59 PM (14 years ago)
Author:
eric@webkit.org
Message:

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.
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r49202 r49204  
     12009-10-06  Kelly Norton  <knorton@google.com>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Fixes <https://bugs.webkit.org/show_bug.cgi?id=30028>
     6        Multiple calls to SetFrontendProxyObject can leave an InspectorTimelineAgent with an invalid
     7        InspectorFrontend.
     8
     9        * inspector/InspectorController.cpp:
     10        (WebCore::InspectorController::setFrontendProxyObject): Adds a check for an existing timeline agent.
     11
    1122009-10-06  Antti Koivisto  <antti@apple.com>
    213
  • trunk/WebCore/inspector/InspectorController.cpp

    r49190 r49204  
    554554
    555555    Setting timelineEnabled = setting(timelineEnabledSettingName);
    556     if (timelineEnabled.type() == Setting::BooleanType && timelineEnabled.booleanValue())
     556    if (m_timelineAgent.get() || (timelineEnabled.type() == Setting::BooleanType && timelineEnabled.booleanValue()))
    557557        m_timelineAgent = new InspectorTimelineAgent(m_frontend.get());
    558558}
Note: See TracChangeset for help on using the changeset viewer.