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

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c9aaa2c5953a2d0f4b77a19723c46778ee5d4735
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 22:14:14 2009 +0000

    Fixes <https://bugs.webkit.org/show_bug.cgi?id=30237>.
    DOM Content and Load lines aren't shown if a page is loaded when the inspector is up.
    
    Reviewed by Timothy Hatcher.
    
    Make sure to call update script object if we have an InspectorFrontend to
    call it on when we get one of the new events.
    
    * inspector/InspectorController.cpp:
    (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
    (WebCore::InspectorController::mainResourceFiredLoadEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 233cabf..d26cf88 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-08  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Fixes <https://bugs.webkit.org/show_bug.cgi?id=30237>.
+        DOM Content and Load lines aren't shown if a page is loaded when the inspector is up.
+        
+        Make sure to call update script object if we have an InspectorFrontend to
+        call it on when we get one of the new events.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
+        (WebCore::InspectorController::mainResourceFiredLoadEvent):
+
 2009-10-08  Geoffrey Garen  <ggaren at apple.com>
 
         Build fix: updated for removal of Structure::markAggregate().
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 0922d7d..6372884 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -904,8 +904,11 @@ void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loade
     if (!enabled() || !isMainResourceLoader(loader, url))
         return;
 
-    if (m_mainResource)
+    if (m_mainResource) {
         m_mainResource->markDOMContentEventTime();
+        if (m_frontend)
+            m_mainResource->updateScriptObject(m_frontend.get());
+    }
 }
 
 void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, const KURL& url)
@@ -913,8 +916,11 @@ void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, con
     if (!enabled() || !isMainResourceLoader(loader, url))
         return;
 
-    if (m_mainResource)
+    if (m_mainResource) {
         m_mainResource->markLoadEventTime();
+        if (m_frontend)
+            m_mainResource->updateScriptObject(m_frontend.get());
+    }
 }
 
 bool InspectorController::isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl)

-- 
WebKit Debian packaging