[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 14:37:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9d8a673fc244be0e431399dfa78f8d448e8efbb7
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 14 13:48:00 2010 +0000
2010-10-14 Pavel Feldman <pfeldman at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69763 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6688d43..b970098 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,29 @@
2010-10-14 Pavel Feldman <pfeldman at 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 at chromium.org>
+
Not reviewed. Re-landing r69757.
2010-10-14 Pavel Podivilov <podivilov at chromium.org>
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 80e243b..402df8b 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -114,6 +114,14 @@ $typeTransform{"unsigned int"} = {
"header" => "",
"JSONType" => "Number"
};
+$typeTransform{"double"} = {
+ "param" => "double",
+ "variable" => "double",
+ "defaultValue" => "0.0",
+ "forward" => "",
+ "header" => "",
+ "JSONType" => "Number"
+};
$typeTransform{"boolean"} = {
"param" => "bool",
"variable"=> "bool",
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index e400604..7cf5a15 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -45,7 +45,9 @@ module core {
[notify] void didCommitLoad();
[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();
[notify] void resetProfilesPanel();
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index af0b383..3bd979c 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -158,6 +158,8 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
, m_client(client)
, m_openingFrontend(false)
, m_cssStore(new InspectorCSSStore(this))
+ , m_loadEventTime(-1.0)
+ , m_domContentEventTime(-1.0)
, m_expiredConsoleMessageCount(0)
, m_showAfterVisible(lastActivePanel)
, m_sessionSettings(InspectorObject::create())
@@ -660,6 +662,10 @@ void InspectorController::populateScriptObjects()
ResourcesMap::iterator resourcesEnd = m_resources.end();
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());
@@ -970,13 +976,11 @@ void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loade
if (!enabled() || !isMainResourceLoader(loader, url))
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);
}
void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, const KURL& url)
@@ -984,13 +988,11 @@ void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, con
if (!enabled() || !isMainResourceLoader(loader, url))
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);
}
bool InspectorController::isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index b2087ba..327acad 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -355,6 +355,8 @@ private:
ResourcesMap m_resources;
HashSet<String> m_knownResources;
FrameResourcesMap m_frameResources;
+ double m_loadEventTime;
+ double m_domContentEventTime;
Vector<OwnPtr<ConsoleMessage> > m_consoleMessages;
unsigned m_expiredConsoleMessageCount;
HashMap<String, double> m_times;
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 6bc3cfb..5ee4a95 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -88,8 +88,6 @@ InspectorResource::InspectorResource(unsigned long identifier, DocumentLoader* l
, m_startTime(-1.0)
, m_responseReceivedTime(-1.0)
, m_endTime(-1.0)
- , m_loadEventTime(-1.0)
- , m_domContentEventTime(-1.0)
, m_connectionID(0)
, m_connectionReused(false)
, m_isMainResource(false)
@@ -322,10 +320,6 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
jsonObject->setNumber("responseReceivedTime", m_responseReceivedTime);
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);
}
@@ -432,18 +426,6 @@ void InspectorResource::endTiming(double actualEndTime)
m_changes.set(CompletionChange);
}
-void InspectorResource::markDOMContentEventTime()
-{
- m_domContentEventTime = currentTime();
- m_changes.set(TimingChange);
-}
-
-void InspectorResource::markLoadEventTime()
-{
- m_loadEventTime = currentTime();
- m_changes.set(TimingChange);
-}
-
void InspectorResource::markFailed()
{
m_failed = true;
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index dccf3b2..aa6001f 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -114,8 +114,6 @@ namespace WebCore {
String requestFormData() const { return m_requestFormData; }
void startTiming();
- void markLoadEventTime();
- void markDOMContentEventTime();
void endTiming(double actualEndTime);
void markFailed();
@@ -183,8 +181,6 @@ namespace WebCore {
double m_startTime;
double m_responseReceivedTime;
double m_endTime;
- double m_loadEventTime;
- double m_domContentEventTime;
unsigned m_connectionID;
bool m_connectionReused;
RefPtr<ResourceLoadTiming> m_loadTiming;
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index c93f2d7..f3fdbf9 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2769,7 +2769,7 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
.resources-event-dividers {
position: absolute;
left: 0;
- right: 0;
+ right: 5px;
height: 100%;
top: 0;
z-index: 300;
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 80e28a5..69d6fc7 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1292,31 +1292,29 @@ WebInspector.updateResource = function(payload)
resource.responseReceivedTime = payload.responseReceivedTime;
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;
+}
+
WebInspector.removeResource = function(identifier)
{
var resource = this.resources[identifier];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list