[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 28059cde085c595f4c6f4c8c40d411ba472717db
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 12:45:49 2010 +0000

    2010-09-29  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: assign the resource loading finish time which was obtained from the network stack
            as the end time for the corresponding event in Timeline.
            See related change for Resources panel https://bugs.webkit.org/show_bug.cgi?id=45664
    
            https://bugs.webkit.org/show_bug.cgi?id=46789
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::didFinishLoading):
            (WebCore::InspectorController::didFailLoading):
            * inspector/InspectorTimelineAgent.cpp:
            (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
            * inspector/InspectorTimelineAgent.h:
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5072d34..0e585d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-29  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: assign the resource loading finish time which was obtained from the network stack
+        as the end time for the corresponding event in Timeline.
+        See related change for Resources panel https://bugs.webkit.org/show_bug.cgi?id=45664
+
+        https://bugs.webkit.org/show_bug.cgi?id=46789
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didFinishLoading):
+        (WebCore::InspectorController::didFailLoading):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
+        * inspector/InspectorTimelineAgent.h:
+
 2010-09-29  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 5cc7744..903cade 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1080,7 +1080,7 @@ void InspectorController::didFinishLoading(unsigned long identifier, double fini
         return;
 
     if (m_timelineAgent)
-        m_timelineAgent->didFinishLoadingResource(identifier, false);
+        m_timelineAgent->didFinishLoadingResource(identifier, false, finishTime);
 
     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
     if (!resource)
@@ -1099,7 +1099,7 @@ void InspectorController::didFailLoading(unsigned long identifier, const Resourc
         return;
 
     if (m_timelineAgent)
-        m_timelineAgent->didFinishLoadingResource(identifier, true);
+        m_timelineAgent->didFinishLoadingResource(identifier, true, 0);
 
     String message = "Failed to load resource";
     if (!error.localizedDescription().isEmpty())
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp
index fbb17c4..656f2f3 100644
--- a/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -242,10 +242,11 @@ void InspectorTimelineAgent::didReceiveResourceResponse()
     didCompleteCurrentRecord(ResourceReceiveResponseTimelineRecordType);
 }
 
-void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail)
+void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail, double finishTime)
 {
     pushGCEventRecords();
-    RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS());
+    // Sometimes network stack can provide for us exact finish loading time. In the other case we will use currentTime.
+    RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(finishTime ? finishTime * 1000 : WTF::currentTimeMS());
     record->setObject("data", TimelineRecordFactory::createResourceFinishData(identifier, didFail));
     record->setNumber("type", ResourceFinishTimelineRecordType);
     setHeapSizeStatistic(record.get());
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 6b3324b..261ae3a 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -122,7 +122,7 @@ public:
     void willSendResourceRequest(unsigned long, bool isMainResource, const ResourceRequest&);
     void willReceiveResourceResponse(unsigned long, const ResourceResponse&);
     void didReceiveResourceResponse();
-    void didFinishLoadingResource(unsigned long, bool didFail);
+    void didFinishLoadingResource(unsigned long, bool didFail, double finishTime);
     void willReceiveResourceData(unsigned long identifier);
     void didReceiveResourceData();
         

-- 
WebKit Debian packaging