Changeset 69763 in webkit

Timestamp:

Oct 14, 2010 6:48:00 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-10-14 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Move load and dom content event timers into InspectorController.
​https://bugs.webkit.org/show_bug.cgi?id=47668

• inspector/CodeGeneratorInspector.pm:
• inspector/Inspector.idl:
• inspector/InspectorController.cpp: (WebCore::InspectorController::InspectorController): (WebCore::InspectorController::populateScriptObjects): (WebCore::InspectorController::mainResourceFiredDOMContentEvent): (WebCore::InspectorController::mainResourceFiredLoadEvent):
• inspector/InspectorController.h:
• inspector/InspectorResource.cpp: (WebCore::InspectorResource::InspectorResource): (WebCore::InspectorResource::updateScriptObject):
• inspector/InspectorResource.h:
• inspector/front-end/inspector.js: (WebInspector.updateResource): (WebInspector.domContentEventFired): (WebInspector.loadEventFired):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (1 diff)
• inspector/Inspector.idl (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (4 diffs)
• inspector/InspectorController.h (modified) (1 diff)
• inspector/InspectorResource.cpp (modified) (3 diffs)
• inspector/InspectorResource.h (modified) (2 diffs)
• inspector/front-end/inspector.css (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-14  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Move load and dom content event timers into InspectorController.
+        https://bugs.webkit.org/show_bug.cgi?id=47668
+
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/Inspector.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
+        (WebCore::InspectorController::mainResourceFiredLoadEvent):
+        * inspector/InspectorController.h:
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::InspectorResource):
+        (WebCore::InspectorResource::updateScriptObject):
+        * inspector/InspectorResource.h:
+        * inspector/front-end/inspector.js:
+        (WebInspector.updateResource):
+        (WebInspector.domContentEventFired):
+        (WebInspector.loadEventFired):
+
 2010-10-14  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/inspector/CodeGeneratorInspector.pm

@@ -111 +111 @@
     "variable" => "unsigned int",
     "defaultValue" => "0u",
+    "forward" => "",
+    "header" => "",
+    "JSONType" => "Number"
+};
+$typeTransform{"double"} = {
+    "param" => "double",
+    "variable" => "double",
+    "defaultValue" => "0.0",
     "forward" => "",
     "header" => "",

trunk/WebCore/inspector/Inspector.idl

@@ -46 +46 @@
         [notify] void evaluateForTestInFrontend(out long testCallId, out String script);
         [notify] void disconnectFromBackend();
+        [notify] void domContentEventFired(out double time);
         [notify] void inspectedURLChanged(out String url);
+        [notify] void loadEventFired(out double time);
         [notify] void removeResource(out unsigned long identifier);
         [notify] void reset();

trunk/WebCore/inspector/InspectorController.cpp

@@ -159 +159 @@
     , m_openingFrontend(false)
     , m_cssStore(new InspectorCSSStore(this))
+    , m_loadEventTime(-1.0)
+    , m_domContentEventTime(-1.0)
     , m_expiredConsoleMessageCount(0)
     , m_showAfterVisible(lastActivePanel)
@@ -661 +663 @@
     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
         it->second->updateScriptObject(m_frontend.get());
+    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());
@@ -971 +977 @@
         return;
 
-    if (m_mainResource) {
-        m_mainResource->markDOMContentEventTime();
-        if (m_timelineAgent)
-            m_timelineAgent->didMarkDOMContentEvent();
-        if (m_frontend)
-            m_mainResource->updateScriptObject(m_frontend.get());
-    }
+    m_domContentEventTime = currentTime();
+    if (m_timelineAgent)
+        m_timelineAgent->didMarkDOMContentEvent();
+    if (m_frontend)
+        m_frontend->domContentEventFired(m_domContentEventTime);
 }
 
@@ -985 +989 @@
         return;
 
-    if (m_mainResource) {
-        m_mainResource->markLoadEventTime();
-        if (m_timelineAgent)
-            m_timelineAgent->didMarkLoadEvent();
-        if (m_frontend)
-            m_mainResource->updateScriptObject(m_frontend.get());
-    }
+    m_loadEventTime = currentTime();
+    if (m_timelineAgent)
+        m_timelineAgent->didMarkLoadEvent();
+    if (m_frontend)
+        m_frontend->loadEventFired(m_loadEventTime);
 }
 

trunk/WebCore/inspector/InspectorController.h

@@ -356 +356 @@
     HashSet<String> m_knownResources;
     FrameResourcesMap m_frameResources;
+    double m_loadEventTime;
+    double m_domContentEventTime;
     Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
     unsigned m_expiredConsoleMessageCount;

trunk/WebCore/inspector/InspectorResource.cpp

@@ -89 +89 @@
     , m_responseReceivedTime(-1.0)
     , m_endTime(-1.0)
-    , m_loadEventTime(-1.0)
-    , m_domContentEventTime(-1.0)
     , m_connectionID(0)
     , m_connectionReused(false)
@@ -323 +321 @@
         if (m_endTime > 0)
             jsonObject->setNumber("endTime", m_endTime);
-        if (m_loadEventTime > 0)
-            jsonObject->setNumber("loadEventTime", m_loadEventTime);
-        if (m_domContentEventTime > 0)
-            jsonObject->setNumber("domContentEventTime", m_domContentEventTime);
         jsonObject->setBoolean("didTimingChange", true);
     }
@@ -433 +427 @@
 }
 
-void InspectorResource::markDOMContentEventTime()
-{
-    m_domContentEventTime = currentTime();
-    m_changes.set(TimingChange);
-}
-
-void InspectorResource::markLoadEventTime()
-{
-    m_loadEventTime = currentTime();
-    m_changes.set(TimingChange);
-}
-
 void InspectorResource::markFailed()
 {

trunk/WebCore/inspector/InspectorResource.h

@@ -115 +115 @@
 
         void startTiming();
-        void markLoadEventTime();
-        void markDOMContentEventTime();
         void endTiming(double actualEndTime);
 
@@ -184 +182 @@
         double m_responseReceivedTime;
         double m_endTime;
-        double m_loadEventTime;
-        double m_domContentEventTime;
         unsigned m_connectionID;
         bool m_connectionReused;

trunk/WebCore/inspector/front-end/inspector.css

@@ -2770 +2770 @@
     position: absolute;
     left: 0;
-    right: 0;
+    right: 5px;
     height: 100%;
     top: 0;

trunk/WebCore/inspector/front-end/inspector.js

@@ -1293 +1293 @@
         if (payload.endTime)
             resource.endTime = payload.endTime;
-
-        if (payload.loadEventTime) {
-            // This loadEventTime is for the main resource, and we want to show it
-            // for all resources on this page. This means we want to set it as a member
-            // of the resources panel instead of the individual resource.
-            this.panels.resources.mainResourceLoadTime = payload.loadEventTime;
-            this.panels.audits.mainResourceLoadTime = payload.loadEventTime;
-            if (this.panels.network)
-                this.panels.network.mainResourceLoadTime = payload.loadEventTime;
-        }
-
-        if (payload.domContentEventTime) {
-            // This domContentEventTime is for the main resource, so it should go in
-            // the resources panel for the same reasons as above.
-            this.panels.resources.mainResourceDOMContentTime = payload.domContentEventTime;
-            this.panels.audits.mainResourceDOMContentTime = payload.domContentEventTime;
-            if (this.panels.network)
-                this.panels.network.mainResourceDOMContentTime = payload.domContentEventTime;
-        }
     }
 
     if (this.panels.network)
         this.panels.network.refreshResource(resource);
+}
+
+
+WebInspector.domContentEventFired = function(time)
+{
+    this.panels.resources.mainResourceDOMContentTime = time;
+    this.panels.audits.mainResourceDOMContentTime = time;
+    if (this.panels.network)
+        this.panels.network.mainResourceDOMContentTime = time;
+}
+
+WebInspector.loadEventFired = function(time)
+{
+    this.panels.resources.mainResourceLoadTime = time;
+    this.panels.audits.mainResourceLoadTime = time;
+    if (this.panels.network)
+        this.panels.network.mainResourceLoadTime = time;
 }