Changeset 161670 in webkit

Timestamp:

Jan 10, 2014 1:31:42 PM (10 years ago)

Author:

timothy@apple.com

Message:

Prevent some resources from showing up in Web Inspector as years in duration.

No WebKit port passed a monotonic time to InspectorInstrumentation::didFinishLoading -- except Chromium.

​https://bugs.webkit.org/show_bug.cgi?id=126760

Reviewed by Joseph Pecoraro.

• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::didFinishLoadingImpl):
Revert part of r102961 to use finishTime as-is and not expect a monotonic time.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Timothy Hatcher  <timothy@apple.com>
+
+        Prevent some resources from showing up in Web Inspector as years in duration.
+
+        No WebKit port passed a monotonic time to InspectorInstrumentation::didFinishLoading -- except Chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=126760
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didFinishLoadingImpl):
+        Revert part of r102961 to use finishTime as-is and not expect a monotonic time.
+
 2014-01-10  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -688 +688 @@
 }
 
-void InspectorInstrumentation::didFinishLoadingImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, DocumentLoader* loader, double monotonicFinishTime)
-{
-    InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent();
-    InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent();
-    if (!timelineAgent && !resourceAgent)
-        return;
-
-    double finishTime = 0.0;
-    // FIXME: Expose all of the timing details to inspector and have it calculate finishTime.
-    if (monotonicFinishTime)
-        finishTime = loader->timing()->monotonicTimeToPseudoWallTime(monotonicFinishTime);
-
-    if (timelineAgent)
+void InspectorInstrumentation::didFinishLoadingImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, DocumentLoader* loader, double finishTime)
+{
+    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->didFinishLoadingResource(identifier, false, finishTime, loader->frame());
-    if (resourceAgent)
+    if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
         resourceAgent->didFinishLoading(identifier, loader, finishTime);
 }