[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 376b86c35a2a6da85695280822db521b1dccae18
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 19:56:59 2009 +0000

    2009-10-06  Kelly Norton  <knorton at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49204 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 17257fc..fd7daa7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-06  Kelly Norton  <knorton at 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 at apple.com>
 
         Reviewed by Dave Kilzer.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index dba2d25..e989df0 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -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());
 }
 

-- 
WebKit Debian packaging