[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 11:40:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f4928548ed0f6ea4e38b0ecc93b7cd0d57bfe354
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 13:07:01 2010 +0000
2010-08-03 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: use InspectorValue to push resource data to the frontend
https://bugs.webkit.org/show_bug.cgi?id=43414
* inspector/Inspector.idl:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::disconnectFrontend): destroy remote frontend object along with the old inspector frontend
(WebCore::InspectorController::populateScriptObjects):
(WebCore::InspectorController::didCommitLoad):
(WebCore::InspectorController::didLoadResourceFromMemoryCache):
(WebCore::InspectorController::identifierForInitialRequest):
(WebCore::InspectorController::mainResourceFiredDOMContentEvent):
(WebCore::InspectorController::mainResourceFiredLoadEvent):
(WebCore::InspectorController::willSendRequest):
(WebCore::InspectorController::didReceiveResponse):
(WebCore::InspectorController::didReceiveContentLength):
(WebCore::InspectorController::didFinishLoading):
(WebCore::InspectorController::didFailLoading):
(WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
(WebCore::InspectorController::scriptImported):
* inspector/InspectorFrontend.cpp:
* inspector/InspectorFrontend.h:
* inspector/InspectorResource.cpp:
(WebCore::buildHeadersObject):
(WebCore::buildObjectForTiming):
(WebCore::InspectorResource::updateScriptObject):
* inspector/InspectorResource.h:
* inspector/front-end/inspector.js:
(WebInspector.updateResource):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64547 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe9f623..da9e71e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2010-08-03 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: use InspectorValue to push resource data to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=43414
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::disconnectFrontend): destroy remote frontend object along with the old inspector frontend
+ (WebCore::InspectorController::populateScriptObjects):
+ (WebCore::InspectorController::didCommitLoad):
+ (WebCore::InspectorController::didLoadResourceFromMemoryCache):
+ (WebCore::InspectorController::identifierForInitialRequest):
+ (WebCore::InspectorController::mainResourceFiredDOMContentEvent):
+ (WebCore::InspectorController::mainResourceFiredLoadEvent):
+ (WebCore::InspectorController::willSendRequest):
+ (WebCore::InspectorController::didReceiveResponse):
+ (WebCore::InspectorController::didReceiveContentLength):
+ (WebCore::InspectorController::didFinishLoading):
+ (WebCore::InspectorController::didFailLoading):
+ (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
+ (WebCore::InspectorController::scriptImported):
+ * inspector/InspectorFrontend.cpp:
+ * inspector/InspectorFrontend.h:
+ * inspector/InspectorResource.cpp:
+ (WebCore::buildHeadersObject):
+ (WebCore::buildObjectForTiming):
+ (WebCore::InspectorResource::updateScriptObject):
+ * inspector/InspectorResource.h:
+ * inspector/front-end/inspector.js:
+ (WebInspector.updateResource):
+
2010-08-03 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r64539.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 25de2b3..c77d6bd 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -44,6 +44,8 @@ module core {
[notify] void setDocument(out Value root);
[notify] void updateConsoleMessageExpiredCount(out unsigned long count);
[notify] void updateConsoleMessageRepeatCount(out unsigned long count);
+ [notify] void updateResource(out Value resource);
+ [notify] void removeResource(out unsigned long resourceId);
#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
[notify] void pausedScript(out Value callFrames);
[notify] void resumedScript();
@@ -62,7 +64,7 @@ module core {
[handler=Controller] void enableResourceTracking(in boolean always);
[handler=Controller] void disableResourceTracking(in boolean always);
- [handler=Controller] void getResourceContent(in long callId, in unsigned long identifier);
+ [handler=Controller] void getResourceContent(in long callId, in unsigned long identifier, out String content);
[handler=Controller] void reloadPage();
[handler=Controller] void startTimelineProfiler();
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 5d81ac3..1c6400c 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -595,6 +595,7 @@ void InspectorController::disconnectFrontend()
if (!m_frontend)
return;
m_frontend.clear();
+ m_remoteFrontend.clear();
connectedFrontendCount--;
if (!connectedFrontendCount)
@@ -661,7 +662,7 @@ 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());
+ it->second->updateScriptObject(m_remoteFrontend.get());
m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
@@ -733,8 +734,8 @@ void InspectorController::pruneResources(ResourcesMap* resourceMap, DocumentLoad
if (!loaderToKeep || !resource->isSameLoader(loaderToKeep)) {
removeResource(resource);
- if (m_frontend)
- resource->releaseScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->releaseScriptObject(m_remoteFrontend.get());
}
}
}
@@ -795,7 +796,7 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
// We don't add the main resource until its load is committed. This is
// needed to keep the load for a user-entered URL from showing up in the
// list of resources for the page they are navigating away from.
- m_mainResource->updateScriptObject(m_frontend.get());
+ m_mainResource->updateScriptObject(m_remoteFrontend.get());
} else {
// Pages loaded from the page cache are committed before
// m_mainResource is the right resource for this load, so we
@@ -906,8 +907,8 @@ void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader* loader,
addResource(resource.get());
- if (m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::identifierForInitialRequest(unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
@@ -930,8 +931,8 @@ void InspectorController::identifierForInitialRequest(unsigned long identifier,
addResource(resource.get());
- if (m_frontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loader, const KURL& url)
@@ -943,8 +944,8 @@ void InspectorController::mainResourceFiredDOMContentEvent(DocumentLoader* loade
m_mainResource->markDOMContentEventTime();
if (m_timelineAgent)
m_timelineAgent->didMarkDOMContentEvent();
- if (m_frontend)
- m_mainResource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ m_mainResource->updateScriptObject(m_remoteFrontend.get());
}
}
@@ -957,8 +958,8 @@ void InspectorController::mainResourceFiredLoadEvent(DocumentLoader* loader, con
m_mainResource->markLoadEventTime();
if (m_timelineAgent)
m_timelineAgent->didMarkLoadEvent();
- if (m_frontend)
- m_mainResource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ m_mainResource->updateScriptObject(m_remoteFrontend.get());
}
}
@@ -1005,8 +1006,8 @@ void InspectorController::willSendRequest(unsigned long identifier, ResourceRequ
resource->startTiming();
resource->updateRequest(request);
- if (resource != m_mainResource && m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (resource != m_mainResource && m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
@@ -1017,8 +1018,8 @@ void InspectorController::didReceiveResponse(unsigned long identifier, const Res
if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
resource->updateResponse(response);
- if (resource != m_mainResource && m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (resource != m_mainResource && m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
if (response.httpStatusCode() >= 400) {
// The ugly code below is due to that String::format() is not utf8-safe at the moment.
@@ -1039,8 +1040,8 @@ void InspectorController::didReceiveContentLength(unsigned long identifier, int
resource->addLength(lengthReceived);
- if (resource != m_mainResource && m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (resource != m_mainResource && m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::didFinishLoading(unsigned long identifier)
@@ -1058,8 +1059,8 @@ void InspectorController::didFinishLoading(unsigned long identifier)
resource->endTiming();
// No need to mute this event for main resource since it happens after did commit load.
- if (m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& error)
@@ -1083,8 +1084,8 @@ void InspectorController::didFailLoading(unsigned long identifier, const Resourc
resource->endTiming();
// No need to mute this event for main resource since it happens after did commit load.
- if (m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
@@ -1104,8 +1105,8 @@ void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identi
resource->setOverrideContent(sourceString, InspectorResource::XHR);
- if (m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::scriptImported(unsigned long identifier, const String& sourceString)
@@ -1119,8 +1120,8 @@ void InspectorController::scriptImported(unsigned long identifier, const String&
resource->setOverrideContent(ScriptString(sourceString), InspectorResource::Script);
- if (m_frontend)
- resource->updateScriptObject(m_frontend.get());
+ if (m_remoteFrontend)
+ resource->updateScriptObject(m_remoteFrontend.get());
}
void InspectorController::enableResourceTracking(bool always, bool reload)
@@ -2182,14 +2183,12 @@ void InspectorController::removeAllScriptsToEvaluateOnLoad()
void InspectorController::getResourceContent(long callId, unsigned long identifier)
{
- if (!m_frontend)
+ if (!m_remoteFrontend)
return;
RefPtr<InspectorResource> resource = m_resources.get(identifier);
- if (resource)
- m_frontend->didGetResourceContent(callId, resource->sourceString());
- else
- m_frontend->didGetResourceContent(callId, "");
+ String content = resource ? resource->sourceString() : String();
+ m_remoteFrontend->didGetResourceContent(callId, content);
}
void InspectorController::reloadPage()
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 8cfd730..296f008 100644
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -103,63 +103,6 @@ void InspectorFrontend::populateSessionSettings(const String& settings)
function.call();
}
-void InspectorFrontend::updateConsoleMessageExpiredCount(unsigned count)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("updateConsoleMessageExpiredCount");
- function.appendArgument(count);
- function.call();
-}
-
-void InspectorFrontend::addConsoleMessage(const ScriptObject& messageObj)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("addConsoleMessage");
- function.appendArgument(messageObj);
- function.call();
-}
-
-void InspectorFrontend::updateConsoleMessageRepeatCount(unsigned count)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("updateConsoleMessageRepeatCount");
- function.appendArgument(count);
- function.call();
-}
-
-void InspectorFrontend::clearConsoleMessages()
-{
- callSimpleFunction("clearConsoleMessages");
-}
-
-bool InspectorFrontend::updateResource(unsigned long identifier, const ScriptObject& resourceObj)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("updateResource");
- function.appendArgument(identifier);
- function.appendArgument(resourceObj);
- bool hadException = false;
- function.call(hadException);
- return !hadException;
-}
-
-void InspectorFrontend::removeResource(unsigned long identifier)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("removeResource");
- function.appendArgument(identifier);
- function.call();
-}
-
-void InspectorFrontend::didGetResourceContent(long callId, const String& content)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("didGetResourceContent");
- function.appendArgument(callId);
- function.appendArgument(content);
- function.call();
-}
-
void InspectorFrontend::updateFocusedNode(long nodeId)
{
ScriptFunctionCall function(m_webInspector, "dispatch");
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 2d37dd3..3846bd4 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -67,15 +67,6 @@ namespace WebCore {
void populateApplicationSettings(const String& settings);
void populateSessionSettings(const String& settings);
- void updateConsoleMessageExpiredCount(unsigned count);
- void addConsoleMessage(const ScriptObject& messageObj);
- void updateConsoleMessageRepeatCount(unsigned count);
- void clearConsoleMessages();
-
- bool updateResource(unsigned long identifier, const ScriptObject& resourceObj);
- void removeResource(unsigned long identifier);
- void didGetResourceContent(long callId, const String& content);
-
void updateFocusedNode(long nodeId);
void showPanel(int panel);
void populateInterface();
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 69618c3..9259d79 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -38,12 +38,12 @@
#include "DocLoader.h"
#include "DocumentLoader.h"
#include "Frame.h"
-#include "InspectorFrontend.h"
+#include "InspectorValues.h"
+#include "RemoteInspectorFrontend.h"
#include "ResourceLoadTiming.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "TextEncoding.h"
-#include "ScriptObject.h"
namespace WebCore {
@@ -146,80 +146,100 @@ void InspectorResource::updateResponse(const ResourceResponse& response)
m_changes.set(TypeChange);
}
-static void populateHeadersObject(ScriptObject* object, const HTTPHeaderMap& headers)
+static PassRefPtr<InspectorObject> buildHeadersObject(const HTTPHeaderMap& headers)
{
+ RefPtr<InspectorObject> object = InspectorObject::create();
HTTPHeaderMap::const_iterator end = headers.end();
for (HTTPHeaderMap::const_iterator it = headers.begin(); it != end; ++it) {
- object->set(it->first.string(), it->second);
+ object->setString(it->first.string(), it->second);
}
+ return object;
}
-void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
+static PassRefPtr<InspectorObject> buildObjectForTiming(ResourceLoadTiming* timing)
+{
+ RefPtr<InspectorObject> jsonObject = InspectorObject::create();
+ jsonObject->setNumber("requestTime", timing->requestTime);
+ jsonObject->setNumber("proxyStart", timing->proxyStart);
+ jsonObject->setNumber("proxyEnd", timing->proxyEnd);
+ jsonObject->setNumber("dnsStart", timing->dnsStart);
+ jsonObject->setNumber("dnsEnd", timing->dnsEnd);
+ jsonObject->setNumber("connectStart", timing->connectStart);
+ jsonObject->setNumber("connectEnd", timing->connectEnd);
+ jsonObject->setNumber("sslStart", timing->sslStart);
+ jsonObject->setNumber("sslEnd", timing->sslEnd);
+ jsonObject->setNumber("sendStart", timing->sendStart);
+ jsonObject->setNumber("sendEnd", timing->sendEnd);
+ jsonObject->setNumber("receiveHeadersEnd", timing->receiveHeadersEnd);
+ return jsonObject;
+}
+
+
+void InspectorResource::updateScriptObject(RemoteInspectorFrontend* frontend)
{
if (m_changes.hasChange(NoChange))
return;
- ScriptObject jsonObject = frontend->newScriptObject();
+ RefPtr<InspectorObject> jsonObject = InspectorObject::create();
+ jsonObject->setNumber("id", m_identifier);
if (m_changes.hasChange(RequestChange)) {
- jsonObject.set("url", m_requestURL.string());
- jsonObject.set("documentURL", m_frame->document()->url().string());
- jsonObject.set("host", m_requestURL.host());
- jsonObject.set("path", m_requestURL.path());
- jsonObject.set("lastPathComponent", m_requestURL.lastPathComponent());
- ScriptObject requestHeaders = frontend->newScriptObject();
- populateHeadersObject(&requestHeaders, m_requestHeaderFields);
- jsonObject.set("requestHeaders", requestHeaders);
- jsonObject.set("mainResource", m_isMainResource);
- jsonObject.set("requestMethod", m_requestMethod);
- jsonObject.set("requestFormData", m_requestFormData);
- jsonObject.set("didRequestChange", true);
+ jsonObject->setString("url", m_requestURL.string());
+ jsonObject->setString("documentURL", m_frame->document()->url().string());
+ jsonObject->setString("host", m_requestURL.host());
+ jsonObject->setString("path", m_requestURL.path());
+ jsonObject->setString("lastPathComponent", m_requestURL.lastPathComponent());
+ RefPtr<InspectorObject> requestHeaders = buildHeadersObject(m_requestHeaderFields);
+ jsonObject->set("requestHeaders", requestHeaders);
+ jsonObject->setBool("mainResource", m_isMainResource);
+ jsonObject->setString("requestMethod", m_requestMethod);
+ jsonObject->setString("requestFormData", m_requestFormData);
+ jsonObject->setBool("didRequestChange", true);
}
if (m_changes.hasChange(ResponseChange)) {
- jsonObject.set("mimeType", m_mimeType);
- jsonObject.set("suggestedFilename", m_suggestedFilename);
- jsonObject.set("expectedContentLength", m_expectedContentLength);
- jsonObject.set("statusCode", m_responseStatusCode);
- jsonObject.set("statusText", m_responseStatusText);
- ScriptObject responseHeaders = frontend->newScriptObject();
- populateHeadersObject(&responseHeaders, m_responseHeaderFields);
- jsonObject.set("responseHeaders", responseHeaders);
- jsonObject.set("connectionID", m_connectionID);
- jsonObject.set("connectionReused", m_connectionReused);
- jsonObject.set("cached", m_cached);
+ jsonObject->setString("mimeType", m_mimeType);
+ jsonObject->setString("suggestedFilename", m_suggestedFilename);
+ jsonObject->setNumber("expectedContentLength", m_expectedContentLength);
+ jsonObject->setNumber("statusCode", m_responseStatusCode);
+ jsonObject->setString("statusText", m_responseStatusText);
+ RefPtr<InspectorObject> responseHeaders = buildHeadersObject(m_responseHeaderFields);
+ jsonObject->set("responseHeaders", responseHeaders);
+ jsonObject->setNumber("connectionID", m_connectionID);
+ jsonObject->setBool("connectionReused", m_connectionReused);
+ jsonObject->setBool("cached", m_cached);
if (m_loadTiming && !m_cached)
- jsonObject.set("timing", buildObjectForTiming(frontend, m_loadTiming.get()));
- jsonObject.set("didResponseChange", true);
+ jsonObject->set("timing", buildObjectForTiming(m_loadTiming.get()));
+ jsonObject->setBool("didResponseChange", true);
}
if (m_changes.hasChange(TypeChange)) {
- jsonObject.set("type", static_cast<int>(type()));
- jsonObject.set("didTypeChange", true);
+ jsonObject->setNumber("type", static_cast<int>(type()));
+ jsonObject->setBool("didTypeChange", true);
}
if (m_changes.hasChange(LengthChange)) {
- jsonObject.set("resourceSize", m_length);
- jsonObject.set("didLengthChange", true);
+ jsonObject->setNumber("resourceSize", m_length);
+ jsonObject->setBool("didLengthChange", true);
}
if (m_changes.hasChange(CompletionChange)) {
- jsonObject.set("failed", m_failed);
- jsonObject.set("finished", m_finished);
- jsonObject.set("didCompletionChange", true);
+ jsonObject->setBool("failed", m_failed);
+ jsonObject->setBool("finished", m_finished);
+ jsonObject->setBool("didCompletionChange", true);
}
if (m_changes.hasChange(TimingChange)) {
if (m_startTime > 0)
- jsonObject.set("startTime", m_startTime);
+ jsonObject->setNumber("startTime", m_startTime);
if (m_responseReceivedTime > 0)
- jsonObject.set("responseReceivedTime", m_responseReceivedTime);
+ jsonObject->setNumber("responseReceivedTime", m_responseReceivedTime);
if (m_endTime > 0)
- jsonObject.set("endTime", m_endTime);
+ jsonObject->setNumber("endTime", m_endTime);
if (m_loadEventTime > 0)
- jsonObject.set("loadEventTime", m_loadEventTime);
+ jsonObject->setNumber("loadEventTime", m_loadEventTime);
if (m_domContentEventTime > 0)
- jsonObject.set("domContentEventTime", m_domContentEventTime);
- jsonObject.set("didTimingChange", true);
+ jsonObject->setNumber("domContentEventTime", m_domContentEventTime);
+ jsonObject->setBool("didTimingChange", true);
}
if (m_changes.hasChange(RedirectsChange)) {
@@ -227,11 +247,11 @@ void InspectorResource::updateScriptObject(InspectorFrontend* frontend)
m_redirects[i]->updateScriptObject(frontend);
}
- if (frontend->updateResource(m_identifier, jsonObject))
- m_changes.clearAll();
+ frontend->updateResource(jsonObject);
+ m_changes.clearAll();
}
-void InspectorResource::releaseScriptObject(InspectorFrontend* frontend)
+void InspectorResource::releaseScriptObject(RemoteInspectorFrontend* frontend)
{
m_changes.setAll();
@@ -390,24 +410,6 @@ void InspectorResource::addLength(int lengthReceived)
m_changes.set(TimingChange);
}
-ScriptObject InspectorResource::buildObjectForTiming(InspectorFrontend* frontend, ResourceLoadTiming* timing)
-{
- ScriptObject jsonObject = frontend->newScriptObject();
- jsonObject.set("requestTime", timing->requestTime);
- jsonObject.set("proxyStart", timing->proxyStart);
- jsonObject.set("proxyEnd", timing->proxyEnd);
- jsonObject.set("dnsStart", timing->dnsStart);
- jsonObject.set("dnsEnd", timing->dnsEnd);
- jsonObject.set("connectStart", timing->connectStart);
- jsonObject.set("connectEnd", timing->connectEnd);
- jsonObject.set("sslStart", timing->sslStart);
- jsonObject.set("sslEnd", timing->sslEnd);
- jsonObject.set("sendStart", timing->sendStart);
- jsonObject.set("sendEnd", timing->sendEnd);
- jsonObject.set("receiveHeadersEnd", timing->receiveHeadersEnd);
- return jsonObject;
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InspectorResource.h b/WebCore/inspector/InspectorResource.h
index 48e1a20..4c12ea0 100644
--- a/WebCore/inspector/InspectorResource.h
+++ b/WebCore/inspector/InspectorResource.h
@@ -33,8 +33,6 @@
#include "HTTPHeaderMap.h"
#include "KURL.h"
-#include "ScriptObject.h"
-#include "ScriptState.h"
#include "ScriptString.h"
#include <wtf/CurrentTime.h>
@@ -47,8 +45,8 @@ namespace WebCore {
class CachedResource;
class DocumentLoader;
- class InspectorFrontend;
class Frame;
+ class RemoteInspectorFrontend;
class ResourceLoadTiming;
class ResourceRequest;
class ResourceResponse;
@@ -78,8 +76,8 @@ namespace WebCore {
~InspectorResource();
PassRefPtr<InspectorResource> appendRedirect(unsigned long identifier, const KURL& redirectURL);
- void updateScriptObject(InspectorFrontend* frontend);
- void releaseScriptObject(InspectorFrontend* frontend);
+ void updateScriptObject(RemoteInspectorFrontend* frontend);
+ void releaseScriptObject(RemoteInspectorFrontend* frontend);
void updateRequest(const ResourceRequest&);
void updateResponse(const ResourceResponse&);
@@ -151,8 +149,6 @@ namespace WebCore {
Type cachedResourceType() const;
CachedResource* cachedResource() const;
- ScriptObject buildObjectForTiming(InspectorFrontend*, ResourceLoadTiming*);
-
unsigned long m_identifier;
RefPtr<DocumentLoader> m_loader;
RefPtr<Frame> m_frame;
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 4bb30c7..9b4b525 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1144,8 +1144,9 @@ WebInspector.selectDOMStorage = function(o)
WebInspector.panels.storage.selectDOMStorage(o);
}
-WebInspector.updateResource = function(identifier, payload)
+WebInspector.updateResource = function(payload)
{
+ var identifier = payload.id;
var resource = this.resources[identifier];
if (!resource) {
resource = new WebInspector.Resource(identifier, payload.url);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list