Commit 3e75f054 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

2010-11-01 Pavel Feldman <pfeldman@chromium.org>

        Reviewed by Timothy Hatcher.

        Web Inspector: remove old resources panel.
        https://bugs.webkit.org/show_bug.cgi?id=45657

        * CMakeLists.txt:
        * English.lproj/localizedStrings.js:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/JSInjectedScriptHostCustom.cpp:
        * inspector/InjectedScriptHost.cpp:
        * inspector/Inspector.idl:
        * inspector/InspectorCSSStore.cpp:
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::~InspectorController):
        (WebCore::InspectorController::connectFrontend):
        (WebCore::InspectorController::releaseFrontendLifetimeAgents):
        (WebCore::InspectorController::populateScriptObjects):
        (WebCore::InspectorController::unbindAllResources):
        (WebCore::InspectorController::didCommitLoad):
        (WebCore::InspectorController::frameDetachedFromParent):
        (WebCore::InspectorController::didLoadResourceFromMemoryCache):
        (WebCore::InspectorController::identifierForInitialRequest):
        (WebCore::InspectorController::willSendRequest):
        (WebCore::InspectorController::markResourceAsCached):
        (WebCore::InspectorController::didReceiveResponse):
        (WebCore::InspectorController::didReceiveContentLength):
        (WebCore::InspectorController::didFinishLoading):
        (WebCore::InspectorController::didFailLoading):
        (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
        (WebCore::InspectorController::scriptImported):
        (WebCore::InspectorController::didCreateWebSocket):
        (WebCore::InspectorController::willSendWebSocketHandshakeRequest):
        (WebCore::InspectorController::didReceiveWebSocketHandshakeResponse):
        (WebCore::InspectorController::didCloseWebSocket):
        * inspector/InspectorController.h:
        * inspector/InspectorFrontendHost.cpp:
        * inspector/InspectorResource.cpp: Removed.
        * inspector/InspectorResource.h: Removed.
        * inspector/InspectorResourceAgent.cpp:
        (WebCore::InspectorResourceAgent::setOverrideContent):
        * inspector/InspectorResourceAgent.h:
        * inspector/front-end/ConsoleView.js:
        (WebInspector.ConsoleView.prototype.addMessage):
        (WebInspector.ConsoleView.prototype.clearMessages):
        * inspector/front-end/ExtensionServer.js:
        (WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
        * inspector/front-end/Images/resourcesSilhouette.png: Removed.
        * inspector/front-end/Resource.js:
        * inspector/front-end/ResourceManager.js:
        (WebInspector.ResourceManager.getContent):
        * inspector/front-end/ResourcesPanel.js: Removed.
        * inspector/front-end/Settings.js:
        * inspector/front-end/StoragePanel.js:
        (WebInspector.StoragePanel):
        (WebInspector.StoragePanel.prototype.get toolbarItemLabel):
        * inspector/front-end/WebKit.qrc:
        * inspector/front-end/inspector.html:
        * inspector/front-end/inspector.js:
        (WebInspector._createPanels):
        (WebInspector.get networkResources):
        (WebInspector.forAllResources):
        (WebInspector.resourceForURL):
        (WebInspector.doLoadedDone.populateInspectorState):
        (WebInspector.openResource):
        (WebInspector.domContentEventFired):
        (WebInspector.loadEventFired):
        (WebInspector.reset):
        (WebInspector._choosePanelToShowSourceLine):

2010-11-01  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Timothy Hatcher.

        Web Inspector: remove old resources panel.
        https://bugs.webkit.org/show_bug.cgi?id=45657

        * src/WebDevToolsAgentImpl.cpp:
        (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
        * src/WebDevToolsAgentImpl.h:

2010-11-01  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Timothy Hatcher.

        Web Inspector: remove old resources panel.
        https://bugs.webkit.org/show_bug.cgi?id=45657

        * http/tests/inspector/inspector-test2.js:
        * http/tests/inspector/resource-har-conversion.html:
        * http/tests/inspector/resource-parameters.html:
        * inspector/audits-panel-functional.html:
        * inspector/extensions-test.js:
        * inspector/report-protocol-errors-expected.txt:
        * inspector/report-protocol-errors.html:
        * inspector/styles-source-offsets.html:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1b9e28b2
2010-11-01 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: remove old resources panel.
https://bugs.webkit.org/show_bug.cgi?id=45657
* http/tests/inspector/inspector-test2.js:
* http/tests/inspector/resource-har-conversion.html:
* http/tests/inspector/resource-parameters.html:
* inspector/audits-panel-functional.html:
* inspector/extensions-test.js:
* inspector/report-protocol-errors-expected.txt:
* inspector/report-protocol-errors.html:
* inspector/styles-source-offsets.html:
2010-11-01 Csaba Osztrogonác <ossy@webkit.org>
Unreviewed.
......@@ -107,30 +107,6 @@ InspectorTest.runAfterPendingDispatches = function(callback)
WebInspector.TestController.prototype.runAfterPendingDispatches(callback);
}
InspectorTest.enableResourceTracking = function(callback)
{
if (Preferences.networkPanelEnabled) {
InspectorTest.reloadPageIfNeeded(callback);
return;
}
if (WebInspector.panels.resources.resourceTrackingEnabled)
callback();
else {
InspectorTest._reloadPageCallback = callback;
WebInspector.panels.resources.toggleResourceTracking();
}
}
InspectorTest.disableResourceTracking = function()
{
if (Preferences.networkPanelEnabled)
return;
if (WebInspector.panels.resources.resourceTrackingEnabled)
WebInspector.panels.resources.toggleResourceTracking();
}
InspectorTest.findDOMNode = function(root, filter, callback)
{
var found = false;
......
......@@ -30,12 +30,11 @@ var test = function()
}
}
InspectorTest.enableResourceTracking(function() {
InspectorTest.reloadPageIfNeeded(function() {
InjectedScriptAccess.getDefault().evaluate("doXHR()", "console", function() {
addCookieHeadersToResource(findResourceByURL(/inspector-test2\.js$/));
var resources = Object.keys(WebInspector.networkResources).map(getHAR).sort(InspectorTest.resourceURLComparer);
InspectorTest.addObject(resources, InspectorTest.HARNondeterministicPropertiesWithSize);
InspectorTest.disableResourceTracking();
InspectorTest.completeTest();
});
});
......
......@@ -6,15 +6,8 @@
<script>
function doit()
{
function callback(result)
{
if (result === "enabling")
return;
window.submitCalled = true;
document.getElementById("submit").click();
}
evaluateInWebInspector("frontend_enableResourceTracking", callback);
window.submitCalled = true;
document.getElementById("submit").click();
}
function onIframeLoad()
......@@ -30,29 +23,10 @@ function onIframeLoad()
evaluateInWebInspector("frontend_dumpFormData", callback);
}
function frontend_enableResourceTracking(testController)
{
if (Preferences.networkPanelEnabled) {
if (!WebInspector.panels.network._pageWasReloaded) {
WebInspector.panels.network._pageWasReloaded = true;
WebInspector.panels.network._reset();
InspectorBackend.reloadPage();
return "enabling";
}
} else if (!WebInspector.panels.resources.resourceTrackingEnabled) {
WebInspector.panels.resources.toggleResourceTracking();
return "enabling";
}
return "enabled";
}
function frontend_dumpFormData(testController)
{
var resource = WebInspector.resourceForURL("http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2=");
if (!Preferences.networkPanelEnabled)
WebInspector.panels.resources.toggleResourceTracking();
if (!resource) {
testController.notifyDone("No resource found");
return;
......
......@@ -33,15 +33,10 @@ function doit()
function frontend_runAudits(testController)
{
if (Preferences.networkPanelEnabled) {
if (!WebInspector.panels.network._pageWasReloaded) {
WebInspector.panels.network._pageWasReloaded = true;
WebInspector.panels.network._reset();
InspectorBackend.reloadPage();
return "refreshing";
}
} else if (!WebInspector.panels.resources.resourceTrackingEnabled) {
WebInspector.panels.resources.toggleResourceTracking();
if (!WebInspector.panels.network._pageWasReloaded) {
WebInspector.panels.network._pageWasReloaded = true;
WebInspector.panels.network._reset();
InspectorBackend.reloadPage();
return "refreshing";
}
......@@ -59,14 +54,7 @@ function frontend_runAudits(testController)
// Audits are done, check results.
var output = frontend_collectAuditResults();
// Avoid influencing tests that require resource tracking to be disabled.
if (Preferences.networkPanelEnabled) {
testController.notifyDone(output.join("\n"));
} else {
WebInspector.panels.resources.toggleResourceTracking();
testController.runAfterPendingDispatches(function() {
testController.notifyDone(output.join("\n"));
});
}
testController.notifyDone(output.join("\n"));
});
} catch(e) {
testController.notifyDone("Exception: " + e.toString());
......
......@@ -41,10 +41,9 @@ InspectorTest.runExtensionTests = function()
});
}
InspectorTest.dispatchOnMessage("extension-tests-done", function() {
InspectorTest.disableResourceTracking();
InspectorTest.completeTest();
});
InspectorTest.enableResourceTracking(addExtension);
InspectorTest.reloadPageIfNeeded(addExtension);
}
}
......
......@@ -60,16 +60,18 @@ Tests that InspectorBackendDispatcher is catching incorrect messages.
seq : 4
success : false
errors : {
0 : "Protocol Error: Argument 'identifier' with type 'Number' was not found."
1 : "Protocol Error: Argument 'encode' with type 'Boolean' was not found."
0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
1 : "Protocol Error: Argument 'url' with type 'String' was not found."
2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
}
}
{
seq : 5
success : false
errors : {
0 : "Protocol Error: Argument 'identifier' has wrong type. It should be 'Number'."
1 : "Protocol Error: Argument 'encode' with type 'Boolean' was not found."
0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
1 : "Protocol Error: Argument 'url' with type 'String' was not found."
2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
}
}
{
......
......@@ -12,10 +12,10 @@ function test()
'{"command":"test"}',
'{"seq":"not a number","command":"test"}',
'{"seq":1,"command":"test"}',
'{"seq":2,"command":"getResourceContent"}',
'{"seq":3,"command":"getResourceContent","arguments":[]}',
'{"seq":4,"command":"getResourceContent","arguments":{}}',
'{"seq":5,"command":"getResourceContent","arguments":{"identifier":"not a number"}}',
'{"seq":2,"command":"resourceContent"}',
'{"seq":3,"command":"resourceContent","arguments":[]}',
'{"seq":4,"command":"resourceContent","arguments":{}}',
'{"seq":5,"command":"resourceContent","arguments":{"identifier":"not a number"}}',
'{"seq":6,"command":"removeBreakpoint","arguments":{}}',
'{"seq":7,"command":"removeBreakpoint","arguments":{"sourceID":"someSourceId","lineNumber":0}}',
......
......@@ -24,11 +24,6 @@ function doit()
function frontend_runTest(testController)
{
if (!Preferences.networkPanelEnabled && !WebInspector.panels.resources.resourceTrackingEnabled) {
WebInspector.panels.resources.toggleResourceTracking();
return "refreshing";
}
testController.waitUntilDone();
frontend_expandDOMSubtree(WebInspector.domAgent.document);
testController.runAfterPendingDispatches(function() {
......
......@@ -1124,7 +1124,6 @@ SET(WebCore_SOURCES
inspector/InspectorFrontendHost.cpp
inspector/InspectorInstrumentation.cpp
inspector/InspectorProfilerAgent.cpp
inspector/InspectorResource.cpp
inspector/InspectorResourceAgent.cpp
inspector/InspectorStyleSheet.cpp
inspector/InspectorValues.cpp
......
2010-11-01 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: remove old resources panel.
https://bugs.webkit.org/show_bug.cgi?id=45657
* CMakeLists.txt:
* English.lproj/localizedStrings.js:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSInjectedScriptHostCustom.cpp:
* inspector/InjectedScriptHost.cpp:
* inspector/Inspector.idl:
* inspector/InspectorCSSStore.cpp:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::~InspectorController):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::releaseFrontendLifetimeAgents):
(WebCore::InspectorController::populateScriptObjects):
(WebCore::InspectorController::unbindAllResources):
(WebCore::InspectorController::didCommitLoad):
(WebCore::InspectorController::frameDetachedFromParent):
(WebCore::InspectorController::didLoadResourceFromMemoryCache):
(WebCore::InspectorController::identifierForInitialRequest):
(WebCore::InspectorController::willSendRequest):
(WebCore::InspectorController::markResourceAsCached):
(WebCore::InspectorController::didReceiveResponse):
(WebCore::InspectorController::didReceiveContentLength):
(WebCore::InspectorController::didFinishLoading):
(WebCore::InspectorController::didFailLoading):
(WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
(WebCore::InspectorController::scriptImported):
(WebCore::InspectorController::didCreateWebSocket):
(WebCore::InspectorController::willSendWebSocketHandshakeRequest):
(WebCore::InspectorController::didReceiveWebSocketHandshakeResponse):
(WebCore::InspectorController::didCloseWebSocket):
* inspector/InspectorController.h:
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorResource.cpp: Removed.
* inspector/InspectorResource.h: Removed.
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::setOverrideContent):
* inspector/InspectorResourceAgent.h:
* inspector/front-end/ConsoleView.js:
(WebInspector.ConsoleView.prototype.addMessage):
(WebInspector.ConsoleView.prototype.clearMessages):
* inspector/front-end/ExtensionServer.js:
(WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
* inspector/front-end/Images/resourcesSilhouette.png: Removed.
* inspector/front-end/Resource.js:
* inspector/front-end/ResourceManager.js:
(WebInspector.ResourceManager.getContent):
* inspector/front-end/ResourcesPanel.js: Removed.
* inspector/front-end/Settings.js:
* inspector/front-end/StoragePanel.js:
(WebInspector.StoragePanel):
(WebInspector.StoragePanel.prototype.get toolbarItemLabel):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.html:
* inspector/front-end/inspector.js:
(WebInspector._createPanels):
(WebInspector.get networkResources):
(WebInspector.forAllResources):
(WebInspector.resourceForURL):
(WebInspector.doLoadedDone.populateInspectorState):
(WebInspector.openResource):
(WebInspector.domContentEventFired):
(WebInspector.loadEventFired):
(WebInspector.reset):
(WebInspector._choosePanelToShowSourceLine):
2010-10-28 Zhenyao Mo <zmo@google.com>
Reviewed by Kenneth Russell.
Bvar localizedStrings = new Object;
......
......@@ -1854,8 +1854,6 @@ webcore_sources += \
WebCore/inspector/InspectorInstrumentation.h \
WebCore/inspector/InspectorProfilerAgent.cpp \
WebCore/inspector/InspectorProfilerAgent.h \
WebCore/inspector/InspectorResource.cpp \
WebCore/inspector/InspectorResource.h \
WebCore/inspector/InspectorResourceAgent.cpp \
WebCore/inspector/InspectorResourceAgent.h \
WebCore/inspector/InspectorState.cpp \
......
......@@ -1954,8 +1954,6 @@
'inspector/InspectorInstrumentation.h',
'inspector/InspectorProfilerAgent.cpp',
'inspector/InspectorProfilerAgent.h',
'inspector/InspectorResource.cpp',
'inspector/InspectorResource.h',
'inspector/InspectorResourceAgent.cpp',
'inspector/InspectorResourceAgent.h',
'inspector/InspectorState.cpp',
......@@ -4452,7 +4450,6 @@
'inspector/front-end/Resource.js',
'inspector/front-end/ResourceCategory.js',
'inspector/front-end/ResourceManager.js',
'inspector/front-end/ResourcesPanel.js',
'inspector/front-end/ResourceView.js',
'inspector/front-end/ScopeChainSidebarPane.js',
'inspector/front-end/Script.js',
......
......@@ -1015,7 +1015,6 @@ SOURCES += \
inspector/InspectorFrontendHost.cpp \
inspector/InspectorInstrumentation.cpp \
inspector/InspectorProfilerAgent.cpp \
inspector/InspectorResource.cpp \
inspector/InspectorResourceAgent.cpp \
inspector/InspectorState.cpp \
inspector/InspectorStorageAgent.cpp \
......
......@@ -63815,14 +63815,6 @@
RelativePath="..\inspector\InspectorProfilerAgent.h"
>
</File>
<File
RelativePath="..\inspector\InspectorResource.cpp"
>
</File>
<File
RelativePath="..\inspector\InspectorResource.h"
>
</File>
<File
RelativePath="..\inspector\InspectorResourceAgent.cpp"
>
......@@ -64202,10 +64194,6 @@
RelativePath="..\inspector\front-end\ResourceManager.js"
>
</File>
<File
RelativePath="..\inspector\front-end\ResourcesPanel.js"
>
</File>
<File
RelativePath="..\inspector\front-end\ResourceView.js"
>
......@@ -934,8 +934,6 @@
41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */; };
41F0618E0F5F069800A07EAC /* ConsoleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */; };
41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */; };
41F062010F5F0B6600A07EAC /* InspectorResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F061FF0F5F0B6600A07EAC /* InspectorResource.h */; };
41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F062000F5F0B6600A07EAC /* InspectorResource.cpp */; };
41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */; };
41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */; };
41F066E40F64BCF600A07EAC /* ScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F066E20F64BCF600A07EAC /* ScriptObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -7004,8 +7002,6 @@
41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMStorageResource.cpp; sourceTree = "<group>"; };
41F0618C0F5F069800A07EAC /* ConsoleMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleMessage.h; sourceTree = "<group>"; };
41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleMessage.cpp; sourceTree = "<group>"; };
41F061FF0F5F0B6600A07EAC /* InspectorResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorResource.h; sourceTree = "<group>"; };
41F062000F5F0B6600A07EAC /* InspectorResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorResource.cpp; sourceTree = "<group>"; };
41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseResource.h; sourceTree = "<group>"; };
41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseResource.cpp; sourceTree = "<group>"; };
41F066E20F64BCF600A07EAC /* ScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptObject.h; sourceTree = "<group>"; };
......@@ -12300,8 +12296,6 @@
20D629251253690B00081543 /* InspectorInstrumentation.h */,
9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */,
9F0D6B2D121BFEBA006C0288 /* InspectorProfilerAgent.h */,
41F062000F5F0B6600A07EAC /* InspectorResource.cpp */,
41F061FF0F5F0B6600A07EAC /* InspectorResource.h */,
82AB1771125C826700C5069D /* InspectorResourceAgent.cpp */,
82AB1772125C826700C5069D /* InspectorResourceAgent.h */,
4FA3B908125CD12100300BAD /* InspectorState.cpp */,
......@@ -19819,7 +19813,6 @@
7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
41F062010F5F0B6600A07EAC /* InspectorResource.h in Headers */,
82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
7AB0B1C11211A62200A76940 /* InspectorStorageAgent.h in Headers */,
......@@ -22415,7 +22408,6 @@
7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */,
9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */,
41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */,
82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,
7AB0B1C01211A62200A76940 /* InspectorStorageAgent.cpp in Sources */,
......@@ -47,7 +47,6 @@
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
#include "InspectorController.h"
#include "InspectorResource.h"
#include "InspectorValues.h"
#include "JSDOMWindow.h"
#include "JSDOMWindowCustom.h"
......
......@@ -43,7 +43,6 @@
#include "InspectorController.h"
#include "InspectorDOMAgent.h"
#include "InspectorFrontend.h"
#include "InspectorResource.h"
#include "Pasteboard.h"
#if ENABLE(JAVASCRIPT_DEBUGGER)
......
......@@ -46,7 +46,6 @@ module core {
[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();
[notify] void setChildNodes(out long parentId, out Array nodes);
......@@ -56,7 +55,6 @@ module core {
[notify] void timelineProfilerWasStarted();
[notify] void timelineProfilerWasStopped();
[notify] void updateFocusedNode(out long nodeId);
[notify] void updateResource(out Value resource);
#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
[notify] void addProfileHeader(out Object header);
......@@ -100,8 +98,6 @@ module core {
[handler=Controller] void setMonitoringXHREnabled(in boolean enable, out boolean newState);
[handler=Controller] void setResourceTrackingEnabled(in boolean enabled, in boolean always, out boolean newState);
[handler=Controller] void getResourceContent(in unsigned long identifier, in boolean encode, out String content);
[handler=Controller] void reloadPage();
[handler=Controller] void startTimelineProfiler();
......
......@@ -43,7 +43,6 @@
#include "Frame.h"
#include "HTMLHeadElement.h"
#include "InspectorController.h"
#include "InspectorResource.h"
#include "InspectorResourceAgent.h"
#include "Node.h"
#include "PlatformString.h"
......
This diff is collapsed.
......@@ -86,12 +86,6 @@ class SharedBuffer;
class Storage;
class StorageArea;
#define LEGACY_RESOURCE_TRACKING_ENABLED 0
#if LEGACY_RESOURCE_TRACKING_ENABLED
class InspectorResource;
#endif
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
class InspectorApplicationCacheAgent;
#endif
......@@ -107,10 +101,6 @@ class WebSocketHandshakeResponse;
class InspectorController : public Noncopyable {
public:
#if LEGACY_RESOURCE_TRACKING_ENABLED
typedef HashMap<unsigned long, RefPtr<InspectorResource> > ResourcesMap;
typedef HashMap<RefPtr<Frame>, ResourcesMap*> FrameResourcesMap;
#endif
typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
......@@ -179,12 +169,6 @@ public:
void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber);
void scriptImported(unsigned long identifier, const String& sourceString);
void setResourceTrackingEnabled(bool enabled, bool always, bool* newState);
#if LEGACY_RESOURCE_TRACKING_ENABLED
void setResourceTrackingEnabled(bool enabled);
bool resourceTrackingEnabled() const;
#endif
void ensureSettingsLoaded();
void startTimelineProfiler();
......@@ -230,10 +214,6 @@ public:
void didCloseWebSocket(unsigned long identifier);
#endif
#if LEGACY_RESOURCE_TRACKING_ENABLED
const ResourcesMap& resources() const { return m_resources; }
#endif
bool hasFrontend() const { return m_frontend; }
void drawNodeHighlight(GraphicsContext&) const;
......@@ -332,15 +312,6 @@ private:
void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
#if LEGACY_RESOURCE_TRACKING_ENABLED
void addResource(InspectorResource*);
void removeResource(InspectorResource*);
InspectorResource* getTrackedResource(unsigned long identifier);
void pruneResources(ResourcesMap*, DocumentLoader* loaderToKeep = 0);
void removeAllResources(ResourcesMap* map) { pruneResources(map); }
#endif
void getResourceContent(unsigned long identifier, bool encode, String* content);
bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl);
void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
......@@ -372,12 +343,6 @@ private:
#endif
RefPtr<Node> m_nodeToFocus;
#if LEGACY_RESOURCE_TRACKING_ENABLED
RefPtr<InspectorResource> m_mainResource;
ResourcesMap m_resources;
HashSet<String> m_knownResources;
FrameResourcesMap m_frameResources;
#endif
RefPtr<InspectorResourceAgent> m_resourceAgent;
unsigned long m_mainResourceIdentifier;
double m_loadEventTime;
......
......@@ -42,7 +42,6 @@
#include "HitTestResult.h"
#include "HTMLFrameOwnerElement.h"
#include "InspectorFrontendClient.h"
#include "InspectorResource.h"
#include "Page.h"
#include "Pasteboard.h"
#include "ScriptFunctionCall.h"
......
/*
* Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
* Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "InspectorResource.h"
#if ENABLE(INSPECTOR)
#include "Base64.h"
#include "Cache.h"
#include "CachedResource.h"
#include "CachedResourceLoader.h"
#include "DocumentLoader.h"
#include "Frame.h"
#include "InspectorFrontend.h"
#include "InspectorResourceAgent.h"
#include "InspectorValues.h"
#include "ResourceLoadTiming.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "TextEncoding.h"
#include "WebSocketHandshakeRequest.h"
#include "WebSocketHandshakeResponse.h"
#include <wtf/Assertions.h>
#include <wtf/text/StringBuffer.h>
namespace WebCore {
#if ENABLE(WEB_SOCKETS)
// Create human-readable binary representation, like "01:23:45:67:89:AB:CD:EF".
static String createReadableStringFromBinary(const unsigned char* value, size_t length)
{
ASSERT(length > 0);
static const char hexDigits[17] = "0123456789ABCDEF";
size_t bufferSize = length * 3 - 1;
StringBuffer buffer(bufferSize);
size_t index = 0;
for (size_t i = 0; i < length; ++i) {
if (i > 0)
buffer[index++] = ':';
buffer[index++] = hexDigits[value[i] >> 4];
buffer[index++] = hexDigits[value[i] & 0xF];
}
ASSERT(index == bufferSize);
return String::adopt(buffer);
}
#endif