[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ae0c22099bdd2445d99c74576c53c36a30cc9d3f
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 14:10:41 2010 +0000

    2010-11-02  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Remove obsolete code.
            It is not required to push onload and DOMContentLoaded events times to the fresh instance of Inspector.
            Network Panel is showing the markers only after reloading the inspected page.
            https://bugs.webkit.org/show_bug.cgi?id=48854
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::InspectorController):
            (WebCore::InspectorController::populateScriptObjects):
            (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
            (WebCore::InspectorController::mainResourceFiredLoadEvent):
            * inspector/InspectorController.h:
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb1ae98..e42a6ca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-02  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Remove obsolete code.
+        It is not required to push onload and DOMContentLoaded events times to the fresh instance of Inspector.
+        Network Panel is showing the markers only after reloading the inspected page.
+        https://bugs.webkit.org/show_bug.cgi?id=48854
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
+        (WebCore::InspectorController::mainResourceFiredLoadEvent):
+        * inspector/InspectorController.h:
+
 2010-11-03  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 5a4abc0..0825dc6 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -143,8 +143,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
     , m_openingFrontend(false)
     , m_cssStore(new InspectorCSSStore(this))
     , m_mainResourceIdentifier(0)
-    , m_loadEventTime(-1.0)
-    , m_domContentEventTime(-1.0)
     , m_expiredConsoleMessageCount(0)
     , m_groupLevel(0)
     , m_previousMessage(0)
@@ -629,11 +627,6 @@ void InspectorController::populateScriptObjects()
         m_frontend->profilerWasEnabled();
 #endif
 
-    if (m_domContentEventTime != -1.0)
-        m_frontend->domContentEventFired(m_domContentEventTime);
-    if (m_loadEventTime != -1.0)
-        m_frontend->loadEventFired(m_loadEventTime);
-
     m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
     if (m_nodeToFocus)
@@ -804,11 +797,10 @@ void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loade
     if (!enabled() || !isMainResourceLoader(loader, url))
         return;
 
-    m_domContentEventTime = currentTime();
     if (m_timelineAgent)
         m_timelineAgent->didMarkDOMContentEvent();
     if (m_frontend)
-        m_frontend->domContentEventFired(m_domContentEventTime);
+        m_frontend->domContentEventFired(currentTime());
 }
 
 void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, const KURL& url)
@@ -816,11 +808,10 @@ void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, con
     if (!enabled() || !isMainResourceLoader(loader, url))
         return;
 
-    m_loadEventTime = currentTime();
     if (m_timelineAgent)
         m_timelineAgent->didMarkLoadEvent();
     if (m_frontend)
-        m_frontend->loadEventFired(m_loadEventTime);
+        m_frontend->loadEventFired(currentTime());
 }
 
 bool InspectorController::isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index ab728a1..86fea67 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -349,8 +349,6 @@ private:
     RefPtr<Node> m_nodeToFocus;
     RefPtr<InspectorResourceAgent> m_resourceAgent;
     unsigned long m_mainResourceIdentifier;
-    double m_loadEventTime;
-    double m_domContentEventTime;
     Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
     unsigned m_expiredConsoleMessageCount;
     HashMap<String, double> m_times;

-- 
WebKit Debian packaging