Changeset 71035 in webkit


Ignore:
Timestamp:
Nov 1, 2010 10:56:20 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

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:
Location:
trunk
Files:
4 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r71028 r71035  
     12010-11-01  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: remove old resources panel.
     6        https://bugs.webkit.org/show_bug.cgi?id=45657
     7
     8        * http/tests/inspector/inspector-test2.js:
     9        * http/tests/inspector/resource-har-conversion.html:
     10        * http/tests/inspector/resource-parameters.html:
     11        * inspector/audits-panel-functional.html:
     12        * inspector/extensions-test.js:
     13        * inspector/report-protocol-errors-expected.txt:
     14        * inspector/report-protocol-errors.html:
     15        * inspector/styles-source-offsets.html:
     16
    1172010-11-01  Csaba Osztrogonác  <ossy@webkit.org>
    218

  • trunk/LayoutTests/http/tests/inspector/inspector-test2.js

    r70762 r71035  
    108108}
    109109
    110 InspectorTest.enableResourceTracking = function(callback)
    111 {
    112     if (Preferences.networkPanelEnabled) {
    113         InspectorTest.reloadPageIfNeeded(callback);
    114         return;
    115     }
    116 
    117     if (WebInspector.panels.resources.resourceTrackingEnabled)
    118         callback();
    119     else {
    120         InspectorTest._reloadPageCallback = callback;
    121         WebInspector.panels.resources.toggleResourceTracking();
    122     }
    123 }
    124 
    125 InspectorTest.disableResourceTracking = function()
    126 {
    127     if (Preferences.networkPanelEnabled)
    128         return;
    129 
    130     if (WebInspector.panels.resources.resourceTrackingEnabled)
    131         WebInspector.panels.resources.toggleResourceTracking();
    132 }
    133 
    134110InspectorTest.findDOMNode = function(root, filter, callback)
    135111{

  • trunk/LayoutTests/http/tests/inspector/resource-har-conversion.html

    r70762 r71035  
    3131    }
    3232
    33     InspectorTest.enableResourceTracking(function() {
     33    InspectorTest.reloadPageIfNeeded(function() {
    3434        InjectedScriptAccess.getDefault().evaluate("doXHR()", "console", function() {
    3535            addCookieHeadersToResource(findResourceByURL(/inspector-test2\.js$/));
    3636            var resources = Object.keys(WebInspector.networkResources).map(getHAR).sort(InspectorTest.resourceURLComparer);
    3737            InspectorTest.addObject(resources, InspectorTest.HARNondeterministicPropertiesWithSize);
    38             InspectorTest.disableResourceTracking();
    3938            InspectorTest.completeTest();
    4039        });

  • trunk/LayoutTests/http/tests/inspector/resource-parameters.html

    r70762 r71035  
    77function doit()
    88{
    9     function callback(result)
    10     {
    11         if (result === "enabling")
    12             return;
    13         window.submitCalled = true;
    14         document.getElementById("submit").click();
    15     }
    16 
    17     evaluateInWebInspector("frontend_enableResourceTracking", callback);
     9    window.submitCalled = true;
     10    document.getElementById("submit").click();
    1811}
    1912
    … …  
    3124}
    3225
    33 function frontend_enableResourceTracking(testController)
    34 {
    35     if (Preferences.networkPanelEnabled) {
    36         if (!WebInspector.panels.network._pageWasReloaded) {
    37             WebInspector.panels.network._pageWasReloaded = true;
    38             WebInspector.panels.network._reset();
    39             InspectorBackend.reloadPage();
    40             return "enabling";
    41         }
    42     } else if (!WebInspector.panels.resources.resourceTrackingEnabled) {
    43         WebInspector.panels.resources.toggleResourceTracking();
    44         return "enabling";
    45     }
    46     return "enabled";
    47 }
    48 
    4926function frontend_dumpFormData(testController)
    5027{
    5128    var resource = WebInspector.resourceForURL("http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2=");
    52 
    53     if (!Preferences.networkPanelEnabled)
    54         WebInspector.panels.resources.toggleResourceTracking();
    5529
    5630    if (!resource) {

  • trunk/LayoutTests/inspector/audits-panel-functional.html

    r70879 r71035  
    3434function frontend_runAudits(testController)
    3535{
    36     if (Preferences.networkPanelEnabled) {
    37         if (!WebInspector.panels.network._pageWasReloaded) {
    38             WebInspector.panels.network._pageWasReloaded = true;
    39             WebInspector.panels.network._reset();
    40             InspectorBackend.reloadPage();
    41             return "refreshing";
    42         }
    43     } else if (!WebInspector.panels.resources.resourceTrackingEnabled) {
    44         WebInspector.panels.resources.toggleResourceTracking();
     36    if (!WebInspector.panels.network._pageWasReloaded) {
     37        WebInspector.panels.network._pageWasReloaded = true;
     38        WebInspector.panels.network._reset();
     39        InspectorBackend.reloadPage();
    4540        return "refreshing";
    4641    }
    … …  
    6055            var output = frontend_collectAuditResults();
    6156            // Avoid influencing tests that require resource tracking to be disabled.
    62             if (Preferences.networkPanelEnabled) {
    63                 testController.notifyDone(output.join("\n"));
    64             } else {
    65                 WebInspector.panels.resources.toggleResourceTracking();
    66                 testController.runAfterPendingDispatches(function() {
    67                     testController.notifyDone(output.join("\n"));
    68                 });
    69             }
     57            testController.notifyDone(output.join("\n"));
    7058        });
    7159    } catch(e) {

  • trunk/LayoutTests/inspector/extensions-test.js

    r66477 r71035  
    4242    }
    4343    InspectorTest.dispatchOnMessage("extension-tests-done", function() {
    44         InspectorTest.disableResourceTracking();
    4544        InspectorTest.completeTest();
    4645    });
    47     InspectorTest.enableResourceTracking(addExtension);
     46    InspectorTest.reloadPageIfNeeded(addExtension);
    4847}
    4948

  • trunk/LayoutTests/inspector/report-protocol-errors-expected.txt

    r69189 r71035  
    6161    success : false
    6262    errors : {
    63         0 : "Protocol Error: Argument 'identifier' with type 'Number' was not found."
    64         1 : "Protocol Error: Argument 'encode' with type 'Boolean' was not found."
     63        0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
     64        1 : "Protocol Error: Argument 'url' with type 'String' was not found."
     65        2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
    6566    }
    6667}
    … …  
    6970    success : false
    7071    errors : {
    71         0 : "Protocol Error: Argument 'identifier' has wrong type. It should be 'Number'."
    72         1 : "Protocol Error: Argument 'encode' with type 'Boolean' was not found."
     72        0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
     73        1 : "Protocol Error: Argument 'url' with type 'String' was not found."
     74        2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
    7375    }
    7476}

  • trunk/LayoutTests/inspector/report-protocol-errors.html

    r66663 r71035  
    1313        '{"seq":"not a number","command":"test"}',
    1414        '{"seq":1,"command":"test"}',
    15         '{"seq":2,"command":"getResourceContent"}',
    16         '{"seq":3,"command":"getResourceContent","arguments":[]}',
    17         '{"seq":4,"command":"getResourceContent","arguments":{}}',
    18         '{"seq":5,"command":"getResourceContent","arguments":{"identifier":"not a number"}}',
     15        '{"seq":2,"command":"resourceContent"}',
     16        '{"seq":3,"command":"resourceContent","arguments":[]}',
     17        '{"seq":4,"command":"resourceContent","arguments":{}}',
     18        '{"seq":5,"command":"resourceContent","arguments":{"identifier":"not a number"}}',
    1919        '{"seq":6,"command":"removeBreakpoint","arguments":{}}',
    2020        '{"seq":7,"command":"removeBreakpoint","arguments":{"sourceID":"someSourceId","lineNumber":0}}',

  • trunk/LayoutTests/inspector/styles-source-offsets.html

    r70772 r71035  
    2525function frontend_runTest(testController)
    2626{
    27     if (!Preferences.networkPanelEnabled && !WebInspector.panels.resources.resourceTrackingEnabled) {
    28         WebInspector.panels.resources.toggleResourceTracking();
    29         return "refreshing";
    30     }
    31 
    3227    testController.waitUntilDone();
    3328    frontend_expandDOMSubtree(WebInspector.domAgent.document);

  • trunk/WebCore/CMakeLists.txt

    r71009 r71035  
    11251125    inspector/InspectorInstrumentation.cpp
    11261126    inspector/InspectorProfilerAgent.cpp
    1127     inspector/InspectorResource.cpp
    11281127    inspector/InspectorResourceAgent.cpp
    11291128    inspector/InspectorStyleSheet.cpp

  • trunk/WebCore/ChangeLog

    r71034 r71035  
     12010-11-01  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: remove old resources panel.
     6        https://bugs.webkit.org/show_bug.cgi?id=45657
     7
     8        * CMakeLists.txt:
     9        * English.lproj/localizedStrings.js:
     10        * GNUmakefile.am:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * bindings/js/JSInjectedScriptHostCustom.cpp:
     16        * inspector/InjectedScriptHost.cpp:
     17        * inspector/Inspector.idl:
     18        * inspector/InspectorCSSStore.cpp:
     19        * inspector/InspectorController.cpp:
     20        (WebCore::InspectorController::~InspectorController):
     21        (WebCore::InspectorController::connectFrontend):
     22        (WebCore::InspectorController::releaseFrontendLifetimeAgents):
     23        (WebCore::InspectorController::populateScriptObjects):
     24        (WebCore::InspectorController::unbindAllResources):
     25        (WebCore::InspectorController::didCommitLoad):
     26        (WebCore::InspectorController::frameDetachedFromParent):
     27        (WebCore::InspectorController::didLoadResourceFromMemoryCache):
     28        (WebCore::InspectorController::identifierForInitialRequest):
     29        (WebCore::InspectorController::willSendRequest):
     30        (WebCore::InspectorController::markResourceAsCached):
     31        (WebCore::InspectorController::didReceiveResponse):
     32        (WebCore::InspectorController::didReceiveContentLength):
     33        (WebCore::InspectorController::didFinishLoading):
     34        (WebCore::InspectorController::didFailLoading):
     35        (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
     36        (WebCore::InspectorController::scriptImported):
     37        (WebCore::InspectorController::didCreateWebSocket):
     38        (WebCore::InspectorController::willSendWebSocketHandshakeRequest):
     39        (WebCore::InspectorController::didReceiveWebSocketHandshakeResponse):
     40        (WebCore::InspectorController::didCloseWebSocket):
     41        * inspector/InspectorController.h:
     42        * inspector/InspectorFrontendHost.cpp:
     43        * inspector/InspectorResource.cpp: Removed.
     44        * inspector/InspectorResource.h: Removed.
     45        * inspector/InspectorResourceAgent.cpp:
     46        (WebCore::InspectorResourceAgent::setOverrideContent):
     47        * inspector/InspectorResourceAgent.h:
     48        * inspector/front-end/ConsoleView.js:
     49        (WebInspector.ConsoleView.prototype.addMessage):
     50        (WebInspector.ConsoleView.prototype.clearMessages):
     51        * inspector/front-end/ExtensionServer.js:
     52        (WebInspector.ExtensionServer.prototype._onRevealAndSelectResource):
     53        * inspector/front-end/Images/resourcesSilhouette.png: Removed.
     54        * inspector/front-end/Resource.js:
     55        * inspector/front-end/ResourceManager.js:
     56        (WebInspector.ResourceManager.getContent):
     57        * inspector/front-end/ResourcesPanel.js: Removed.
     58        * inspector/front-end/Settings.js:
     59        * inspector/front-end/StoragePanel.js:
     60        (WebInspector.StoragePanel):
     61        (WebInspector.StoragePanel.prototype.get toolbarItemLabel):
     62        * inspector/front-end/WebKit.qrc:
     63        * inspector/front-end/inspector.html:
     64        * inspector/front-end/inspector.js:
     65        (WebInspector._createPanels):
     66        (WebInspector.get networkResources):
     67        (WebInspector.forAllResources):
     68        (WebInspector.resourceForURL):
     69        (WebInspector.doLoadedDone.populateInspectorState):
     70        (WebInspector.openResource):
     71        (WebInspector.domContentEventFired):
     72        (WebInspector.loadEventFired):
     73        (WebInspector.reset):
     74        (WebInspector._choosePanelToShowSourceLine):
     75
    1762010-10-28  Zhenyao Mo  <zmo@google.com>
    277

  • trunk/WebCore/GNUmakefile.am

    r71026 r71035  
    18551855        WebCore/inspector/InspectorProfilerAgent.cpp \
    18561856        WebCore/inspector/InspectorProfilerAgent.h \
    1857         WebCore/inspector/InspectorResource.cpp \
    1858         WebCore/inspector/InspectorResource.h \
    18591857        WebCore/inspector/InspectorResourceAgent.cpp \
    18601858        WebCore/inspector/InspectorResourceAgent.h \

  • trunk/WebCore/WebCore.gypi

    r71009 r71035  
    19551955            'inspector/InspectorProfilerAgent.cpp',
    19561956            'inspector/InspectorProfilerAgent.h',
    1957             'inspector/InspectorResource.cpp',
    1958             'inspector/InspectorResource.h',
    19591957            'inspector/InspectorResourceAgent.cpp',
    19601958            'inspector/InspectorResourceAgent.h',
    … …  
    44534451            'inspector/front-end/ResourceCategory.js',
    44544452            'inspector/front-end/ResourceManager.js',
    4455             'inspector/front-end/ResourcesPanel.js',
    44564453            'inspector/front-end/ResourceView.js',
    44574454            'inspector/front-end/ScopeChainSidebarPane.js',

  • trunk/WebCore/WebCore.pro

    r71009 r71035  
    10161016    inspector/InspectorInstrumentation.cpp \
    10171017    inspector/InspectorProfilerAgent.cpp \
    1018     inspector/InspectorResource.cpp \
    10191018    inspector/InspectorResourceAgent.cpp \
    10201019    inspector/InspectorState.cpp \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r71009 r71035  
    6381763817                        </File>
    6381863818                        <File
    63819                                 RelativePath="..\inspector\InspectorResource.cpp"
    63820                                 >
    63821                         </File>
    63822                         <File
    63823                                 RelativePath="..\inspector\InspectorResource.h"
    63824                                 >
    63825                         </File>
    63826                         <File
    6382763819                                RelativePath="..\inspector\InspectorResourceAgent.cpp"
    6382863820                                >
    … …  
    6420164193                                <File
    6420264194                                        RelativePath="..\inspector\front-end\ResourceManager.js"
    64203                                         >
    64204                                 </File>
    64205                                 <File
    64206                                         RelativePath="..\inspector\front-end\ResourcesPanel.js"
    6420764195                                        >
    6420864196                                </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r71009 r71035  
    935935                41F0618E0F5F069800A07EAC /* ConsoleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */; };
    936936                41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */; };
    937                 41F062010F5F0B6600A07EAC /* InspectorResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F061FF0F5F0B6600A07EAC /* InspectorResource.h */; };
    938                 41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F062000F5F0B6600A07EAC /* InspectorResource.cpp */; };
    939937                41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */; };
    940938                41F062150F5F192600A07EAC /* InspectorDatabaseResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */; };
    … …  
    70057003                41F0618C0F5F069800A07EAC /* ConsoleMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleMessage.h; sourceTree = "<group>"; };
    70067004                41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleMessage.cpp; sourceTree = "<group>"; };
    7007                 41F061FF0F5F0B6600A07EAC /* InspectorResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorResource.h; sourceTree = "<group>"; };
    7008                 41F062000F5F0B6600A07EAC /* InspectorResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorResource.cpp; sourceTree = "<group>"; };
    70097005                41F062120F5F192600A07EAC /* InspectorDatabaseResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDatabaseResource.h; sourceTree = "<group>"; };
    70107006                41F062130F5F192600A07EAC /* InspectorDatabaseResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseResource.cpp; sourceTree = "<group>"; };
    … …  
    1230112297                                9F0D6B2C121BFEBA006C0288 /* InspectorProfilerAgent.cpp */,
    1230212298                                9F0D6B2D121BFEBA006C0288 /* InspectorProfilerAgent.h */,
    12303                                 41F062000F5F0B6600A07EAC /* InspectorResource.cpp */,
    12304                                 41F061FF0F5F0B6600A07EAC /* InspectorResource.h */,
    1230512299                                82AB1771125C826700C5069D /* InspectorResourceAgent.cpp */,
    1230612300                                82AB1772125C826700C5069D /* InspectorResourceAgent.h */,
    … …  
    1982019814                                20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
    1982119815                                9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
    19822                                 41F062010F5F0B6600A07EAC /* InspectorResource.h in Headers */,
    1982319816                                82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
    1982419817                                4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
    … …  
    2241622409                                20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */,
    2241722410                                9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */,
    22418                                 41F062020F5F0B6600A07EAC /* InspectorResource.cpp in Sources */,
    2241922411                                82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
    2242022412                                4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,

  • trunk/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

    r70496 r71035  
    4848#include "InjectedScriptHost.h"
    4949#include "InspectorController.h"
    50 #include "InspectorResource.h"
    5150#include "InspectorValues.h"
    5251#include "JSDOMWindow.h"

  • trunk/WebCore/inspector/InjectedScriptHost.cpp

    r65891 r71035  
    4444#include "InspectorDOMAgent.h"
    4545#include "InspectorFrontend.h"
    46 #include "InspectorResource.h"
    4746#include "Pasteboard.h"
    4847

  • trunk/WebCore/inspector/Inspector.idl

    r70956 r71035  
    4747        [notify] void inspectedURLChanged(out String url);
    4848        [notify] void loadEventFired(out double time);
    49         [notify] void removeResource(out unsigned long identifier);
    5049        [notify] void reset();
    5150        [notify] void resetProfilesPanel();
    … …  
    5756        [notify] void timelineProfilerWasStopped();
    5857        [notify] void updateFocusedNode(out long nodeId);
    59         [notify] void updateResource(out Value resource);
    6058
    6159#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
    … …  
    10199        [handler=Controller] void setMonitoringXHREnabled(in boolean enable, out boolean newState);
    102100
    103         [handler=Controller] void setResourceTrackingEnabled(in boolean enabled, in boolean always, out boolean newState);
    104         [handler=Controller] void getResourceContent(in unsigned long identifier, in boolean encode, out String content);
    105101        [handler=Controller] void reloadPage();
    106102

  • trunk/WebCore/inspector/InspectorCSSStore.cpp

    r70853 r71035  
    4444#include "HTMLHeadElement.h"
    4545#include "InspectorController.h"
    46 #include "InspectorResource.h"
    4746#include "InspectorResourceAgent.h"
    4847#include "Node.h"

  • trunk/WebCore/inspector/InspectorController.cpp

    r70989 r71035  
    103103#include <wtf/UnusedParam.h>
    104104
    105 #if LEGACY_RESOURCE_TRACKING_ENABLED
    106 #include "InspectorResource.h"
    107 #endif
    108 
    109105#if ENABLE(DATABASE)
    110106#include "Database.h"
    … …  
    175171    ASSERT(!m_highlightedNode);
    176172
    177 #if LEGACY_RESOURCE_TRACKING_ENABLED
    178     deleteAllValues(m_frameResources);
    179 #endif
    180 
    181173    releaseFrontendLifetimeAgents();
    182174
    … …  
    233225    return m_state->getBoolean(InspectorState::searchingForNode);
    234226}
    235 
    236 #if LEGACY_RESOURCE_TRACKING_ENABLED
    237 bool InspectorController::resourceTrackingEnabled() const
    238 {
    239     return m_state->getBoolean(InspectorState::resourceTrackingEnabled);
    240 }
    241 #endif
    242227
    243228void InspectorController::getInspectorState(RefPtr<InspectorObject>* state)
    … …  
    486471    m_frontend = new InspectorFrontend(m_client);
    487472    m_domAgent = InspectorDOMAgent::create(m_cssStore.get(), m_frontend.get());
    488 
    489 #if !LEGACY_RESOURCE_TRACKING_ENABLED
    490473    m_resourceAgent = InspectorResourceAgent::create(m_inspectedPage, m_frontend.get());
    491 #endif
    492474
    493475#if ENABLE(DATABASE)
    … …  
    595577void InspectorController::releaseFrontendLifetimeAgents()
    596578{
    597 #if !LEGACY_RESOURCE_TRACKING_ENABLED
    598579    m_resourceAgent.clear();
    599 #endif
    600580
    601581    // m_domAgent is RefPtr. Remove DOM listeners first to ensure that there are
    … …  
    636616    if (m_profilerAgent->enabled())
    637617        m_frontend->profilerWasEnabled();
    638 #endif
    639 
    640 #if LEGACY_RESOURCE_TRACKING_ENABLED
    641     ResourcesMap::iterator resourcesEnd = m_resources.end();
    642     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
    643         it->second->updateScriptObject(m_frontend.get());
    644618#endif
    645619
    … …  
    706680void InspectorController::unbindAllResources()
    707681{
    708 #if LEGACY_RESOURCE_TRACKING_ENABLED
    709     ResourcesMap::iterator resourcesEnd = m_resources.end();
    710     for (ResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
    711         it->second->releaseScriptObject(0);
    712 #endif
    713    
    714682#if ENABLE(DATABASE)
    715683    DatabaseResourcesMap::iterator databasesEnd = m_databaseResources.end();
    … …  
    726694}
    727695
    728 #if LEGACY_RESOURCE_TRACKING_ENABLED
    729 void InspectorController::pruneResources(ResourcesMap* resourceMap, DocumentLoader* loaderToKeep)
    730 {
    731     ASSERT_ARG(resourceMap, resourceMap);
    732 
    733     ResourcesMap mapCopy(*resourceMap);
    734     ResourcesMap::iterator end = mapCopy.end();
    735     for (ResourcesMap::iterator it = mapCopy.begin(); it != end; ++it) {
    736         InspectorResource* resource = (*it).second.get();
    737         if (resource == m_mainResource)
    738             continue;
    739 
    740         if (!loaderToKeep || !resource->isSameLoader(loaderToKeep)) {
    741             removeResource(resource);
    742             if (m_frontend)
    743                 resource->releaseScriptObject(m_frontend.get());
    744         }
    745     }
    746 }
    747 #endif
    748 
    749696void InspectorController::didCommitLoad(DocumentLoader* loader)
    750697{
    … …  
    752699        return;
    753700
    754 #if !LEGACY_RESOURCE_TRACKING_ENABLED
    755701    if (m_resourceAgent)
    756702        m_resourceAgent->didCommitLoad(loader);
    757 #endif
    758703   
    759704    ASSERT(m_inspectedPage);
    … …  
    803748
    804749        if (m_frontend) {
    805 #if LEGACY_RESOURCE_TRACKING_ENABLED
    806             if (!loader->frameLoader()->isLoadingFromCachedPage()) {
    807                 ASSERT(m_mainResource && m_mainResource->isSameLoader(loader));
    808                 // We don't add the main resource until its load is committed. This is
    809                 // needed to keep the load for a user-entered URL from showing up in the
    810                 // list of resources for the page they are navigating away from.
    811                 m_mainResource->updateScriptObject(m_frontend.get());
    812             } else {
    813                 // Pages loaded from the page cache are committed before
    814                 // m_mainResource is the right resource for this load, so we
    815                 // clear it here. It will be re-assigned in
    816                 // identifierForInitialRequest.
    817                 m_mainResource = 0;
    818             }
    819 #endif
    820750            m_mainResourceIdentifier = 0;
    821751            m_frontend->didCommitLoad();
    … …  
    823753        }
    824754    }
    825 
    826 #if LEGACY_RESOURCE_TRACKING_ENABLED
    827     for (Frame* frame = loader->frame(); frame; frame = frame->tree()->traverseNext(loader->frame()))
    828         if (ResourcesMap* resourceMap = m_frameResources.get(frame))
    829             pruneResources(resourceMap, loader);
    830 #endif
    831755}
    832756
    … …  
    836760        return;
    837761
    838 #if LEGACY_RESOURCE_TRACKING_ENABLED
    839     for (Frame* frame = rootFrame; frame; frame = frame->tree()->traverseNext(rootFrame))
    840         if (ResourcesMap* resourceMap = m_frameResources.get(frame))
    841             removeAllResources(resourceMap);
    842 #else
    843762    if (m_resourceAgent)
    844763        m_resourceAgent->frameDetachedFromParent(rootFrame);
    845 #endif
    846 }
    847 
    848 #if LEGACY_RESOURCE_TRACKING_ENABLED
    849 void InspectorController::addResource(InspectorResource* resource)
    850 {
    851     m_resources.set(resource->identifier(), resource);
    852     m_knownResources.add(resource->requestURL());
    853 
    854     Frame* frame = resource->frame();
    855     if (!frame)
    856         return;
    857     ResourcesMap* resourceMap = m_frameResources.get(frame);
    858     if (resourceMap)
    859         resourceMap->set(resource->identifier(), resource);
    860     else {
    861         resourceMap = new ResourcesMap;
    862         resourceMap->set(resource->identifier(), resource);
    863         m_frameResources.set(frame, resourceMap);
    864     }
    865 }
    866 
    867 void InspectorController::removeResource(InspectorResource* resource)
    868 {
    869     m_resources.remove(resource->identifier());
    870     String requestURL = resource->requestURL();
    871     if (!requestURL.isNull())
    872         m_knownResources.remove(requestURL);
    873 
    874     Frame* frame = resource->frame();
    875     if (!frame)
    876         return;
    877     ResourcesMap* resourceMap = m_frameResources.get(frame);
    878     if (!resourceMap) {
    879         ASSERT_NOT_REACHED();
    880         return;
    881     }
    882 
    883     resourceMap->remove(resource->identifier());
    884     if (resourceMap->isEmpty()) {
    885         m_frameResources.remove(frame);
    886         delete resourceMap;
    887     }
    888 }
    889 
    890 InspectorResource* InspectorController::getTrackedResource(unsigned long identifier)
    891 {
    892     if (!enabled())
    893         return 0;
    894 
    895     if (resourceTrackingEnabled())
    896         return m_resources.get(identifier).get();
    897 
    898     bool isMainResource = m_mainResource && m_mainResource->identifier() == identifier;
    899     if (isMainResource)
    900         return m_mainResource.get();
    901 
    902     return 0;
    903 }
    904 #endif
     764}
    905765
    906766void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader* loader, const CachedResource* cachedResource)
    … …  
    911771    ensureSettingsLoaded();
    912772
    913 #if LEGACY_RESOURCE_TRACKING_ENABLED
    914     // If the resource URL is already known, we don't need to add it again since this is just a cached load.
    915     if (m_knownResources.contains(cachedResource->url()))
    916         return;
    917 
    918     ASSERT(m_inspectedPage);
    919     bool isMainResource = isMainResourceLoader(loader, KURL(ParsedURLString, cachedResource->url()));
    920     if (!isMainResource && !resourceTrackingEnabled())
    921         return;
    922 
    923     RefPtr<InspectorResource> resource = InspectorResource::createCached(m_inspectedPage->progress()->createUniqueIdentifier(), loader, cachedResource);
    924 
    925     if (isMainResource) {
    926         m_mainResource = resource;
    927         resource->markMainResource();
    928     }
    929 
    930     addResource(resource.get());
    931 
    932     if (m_frontend)
    933         resource->updateScriptObject(m_frontend.get());
    934 #else
    935773    if (m_resourceAgent)
    936774        m_resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
    937 #endif
    938775}
    939776
    … …  
    950787    ensureSettingsLoaded();
    951788
    952 #if LEGACY_RESOURCE_TRACKING_ENABLED
    953     if (!isMainResource && !resourceTrackingEnabled())
    954         return;
    955 
    956     RefPtr<InspectorResource> resource = InspectorResource::create(identifier, loader, request.url());
    957 
    958     if (isMainResource) {
    959         m_mainResource = resource;
    960         resource->markMainResource();
    961     }
    962 
    963     addResource(resource.get());
    964 
    965     if (m_frontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
    966         resource->updateScriptObject(m_frontend.get());
    967 #else
    968789    if (m_resourceAgent)
    969790        m_resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
    970 #endif
    971791}
    972792
    … …  
    1016836        m_timelineAgent->willSendResourceRequest(identifier, isMainResource, request);
    1017837
    1018 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1019     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1020     if (!resource)
    1021         return;
    1022 
    1023     if (!redirectResponse.isNull()) {
    1024         // Redirect may have empty URL and we'd like to not crash with invalid HashMap entry.
    1025         // See http/tests/misc/will-send-request-returns-null-on-redirect.html
    1026         if (!request.url().isEmpty()) {
    1027             resource->endTiming(0);
    1028             resource->updateResponse(redirectResponse);
    1029 
    1030             // We always store last redirect by the original id key. Rest of the redirects are stored within the last one.
    1031             unsigned long id = m_inspectedPage->progress()->createUniqueIdentifier();
    1032             RefPtr<InspectorResource> withRedirect = resource->appendRedirect(id, request.url());
    1033             removeResource(resource.get());
    1034             addResource(withRedirect.get());
    1035             if (isMainResource) {
    1036                 m_mainResource = withRedirect;
    1037                 withRedirect->markMainResource();
    1038             }
    1039             resource = withRedirect;
    1040         }
    1041     }
    1042 
    1043     resource->startTiming();
    1044     resource->updateRequest(request);
    1045 
    1046     if (resource != m_mainResource && m_frontend)
    1047         resource->updateScriptObject(m_frontend.get());
    1048 #else
    1049838    if (m_resourceAgent)
    1050839        m_resourceAgent->willSendRequest(identifier, request, redirectResponse);
    1051 #endif
    1052840}
    1053841
    … …  
    1057845        return;
    1058846
    1059 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1060     if (RefPtr<InspectorResource> resource = getTrackedResource(identifier))
    1061         resource->markAsCached();
    1062 #else
    1063847    if (m_resourceAgent)
    1064848        m_resourceAgent->markResourceAsCached(identifier);
    1065 #endif
    1066849}
    1067850
    … …  
    1071854        return;
    1072855
    1073 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1074     if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) {
    1075         resource->updateResponse(response);
    1076 
    1077         if (resource != m_mainResource && m_frontend)
    1078             resource->updateScriptObject(m_frontend.get());
    1079     }
    1080     UNUSED_PARAM(loader);
    1081 #else
    1082856    if (m_resourceAgent)
    1083857        m_resourceAgent->didReceiveResponse(identifier, loader, response);
    1084 #endif
    1085858
    1086859    if (response.httpStatusCode() >= 400) {
    … …  
    1095868        return;
    1096869
    1097 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1098     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1099     if (!resource)
    1100         return;
    1101 
    1102     resource->addLength(lengthReceived);
    1103 
    1104     if (resource != m_mainResource && m_frontend)
    1105         resource->updateScriptObject(m_frontend.get());
    1106 #else
    1107870    if (m_resourceAgent)
    1108871        m_resourceAgent->didReceiveContentLength(identifier, lengthReceived);
    1109 #endif
    1110872}
    1111873
    … …  
    1118880        m_timelineAgent->didFinishLoadingResource(identifier, false, finishTime);
    1119881
    1120 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1121     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1122     if (!resource)
    1123         return;
    1124 
    1125     resource->endTiming(finishTime);
    1126 
    1127     // No need to mute this event for main resource since it happens after did commit load.
    1128     if (m_frontend)
    1129         resource->updateScriptObject(m_frontend.get());
    1130 #else
    1131882    if (m_resourceAgent)
    1132883        m_resourceAgent->didFinishLoading(identifier, finishTime);
    1133 #endif
    1134884}
    1135885
    … …  
    1147897        addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, error.failingURL());
    1148898
    1149 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1150     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1151     if (!resource)
    1152         return;
    1153 
    1154     resource->markFailed(error.localizedDescription());
    1155     resource->endTiming(0);
    1156 
    1157     // No need to mute this event for main resource since it happens after did commit load.
    1158     if (m_frontend)
    1159         resource->updateScriptObject(m_frontend.get());
    1160 #else
    1161899    if (m_resourceAgent)
    1162900        m_resourceAgent->didFailLoading(identifier, error);
    1163 #endif
    1164901}
    1165902
    … …  
    1172909        addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, "XHR finished loading: \"" + url + "\".", sendLineNumber, sendURL);
    1173910
    1174 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1175     if (!resourceTrackingEnabled())
    1176         return;
    1177 
    1178     InspectorResource* resource = m_resources.get(identifier).get();
    1179     if (!resource)
    1180         return;
    1181 
    1182     resource->setOverrideContent(sourceString, InspectorResource::XHR);
    1183 
    1184     if (m_frontend)
    1185         resource->updateScriptObject(m_frontend.get());
    1186 #else
    1187911    if (m_resourceAgent)
    1188         m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::XHR);
    1189 #endif
     912        m_resourceAgent->setOverrideContent(identifier, sourceString, "XHR");
    1190913}
    1191914
    … …  
    1195918        return;
    1196919
    1197 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1198     if (!resourceTrackingEnabled())
    1199         return;
    1200 
    1201     InspectorResource* resource = m_resources.get(identifier).get();
    1202     if (!resource)
    1203         return;
    1204 
    1205     resource->setOverrideContent(sourceString, InspectorResource::Script);
    1206 
    1207     if (m_frontend)
    1208         resource->updateScriptObject(m_frontend.get());
    1209 #else
    1210920    if (m_resourceAgent)
    1211         m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::Script);
    1212 #endif
    1213 }
    1214 
    1215 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1216 void InspectorController::setResourceTrackingEnabled(bool enable)
    1217 {
    1218     if (!enabled())
    1219         return;
    1220 
    1221     ASSERT(m_inspectedPage);
    1222     m_state->setBoolean(InspectorState::resourceTrackingEnabled, enable);
    1223 }
    1224 #endif
    1225 
    1226 void InspectorController::setResourceTrackingEnabled(bool enable, bool always, bool* newState)
    1227 {
    1228 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1229     *newState = enable;
    1230 
    1231     if (always)
    1232         m_state->setBoolean(InspectorState::resourceTrackingAlwaysEnabled, enable);
    1233 
    1234     if (resourceTrackingEnabled() == enable)
    1235         return;
    1236 
    1237     ASSERT(m_inspectedPage);
    1238     m_state->setBoolean(InspectorState::resourceTrackingEnabled, enable);
    1239 
    1240     if (enable)
    1241         reloadPage();
    1242 #else
    1243     UNUSED_PARAM(enable);
    1244     UNUSED_PARAM(always);
    1245     UNUSED_PARAM(newState);
    1246 #endif
     921        m_resourceAgent->setOverrideContent(identifier, sourceString, "Script");
    1247922}
    1248923
    … …  
    15691244    ASSERT(m_inspectedPage);
    15701245
    1571 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1572     RefPtr<InspectorResource> resource = InspectorResource::createWebSocket(identifier, requestURL, documentURL);
    1573     addResource(resource.get());
    1574 
    1575     if (m_frontend)
    1576         resource->updateScriptObject(m_frontend.get());
    1577 #else
    15781246    if (m_resourceAgent)
    15791247        m_resourceAgent->didCreateWebSocket(identifier, requestURL);
    15801248    UNUSED_PARAM(documentURL);
    1581 #endif
    15821249}
    15831250
    15841251void InspectorController::willSendWebSocketHandshakeRequest(unsigned long identifier, const WebSocketHandshakeRequest& request)
    15851252{
    1586 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1587     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1588     if (!resource)
    1589         return;
    1590     resource->startTiming();
    1591     resource->updateWebSocketRequest(request);
    1592     if (m_frontend)
    1593         resource->updateScriptObject(m_frontend.get());
    1594 #else
    15951253    if (m_resourceAgent)
    15961254        m_resourceAgent->willSendWebSocketHandshakeRequest(identifier, request);
    1597 #endif
    15981255}
    15991256
    16001257void InspectorController::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse& response)
    16011258{
    1602 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1603     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1604     if (!resource)
    1605         return;
    1606     // Calling resource->markResponseReceivedTime() here makes resources bar chart confusing, because
    1607     // we cannot apply the "latency + download" model of regular resources to WebSocket connections.
    1608     // FIXME: Design a new UI for bar charts of WebSocket resources, and record timing here.
    1609     resource->updateWebSocketResponse(response);
    1610     if (m_frontend)
    1611         resource->updateScriptObject(m_frontend.get());
    1612 #else
    16131259    if (m_resourceAgent)
    16141260        m_resourceAgent->didReceiveWebSocketHandshakeResponse(identifier, response);
    1615 #endif
    16161261}
    16171262
    16181263void InspectorController::didCloseWebSocket(unsigned long identifier)
    16191264{
    1620 #if LEGACY_RESOURCE_TRACKING_ENABLED
    1621     RefPtr<InspectorResource> resource = getTrackedResource(identifier);
    1622     if (!resource)
    1623         return;
    1624 
    1625     resource->endTiming(0);
    1626     if (m_frontend)
    1627         resource->updateScriptObject(m_frontend.get());
    1628 #else
    16291265    if (m_resourceAgent)
    16301266        m_resourceAgent->didCloseWebSocket(identifier);
    1631 #endif
    16321267}
    16331268#endif // ENABLE(WEB_SOCKETS)
    … …  
    21731808}
    21741809
    2175 void InspectorController::getResourceContent(unsigned long identifier, bool encode, String* content)
    2176 {
    2177 #if LEGACY_RESOURCE_TRACKING_ENABLED
    2178     RefPtr<InspectorResource> resource = m_resources.get(identifier);
    2179     if (!resource) {
    2180         *content = String();
    2181         return;
    2182     }
    2183     *content = encode ? resource->sourceBytes() : resource->sourceString();
    2184 #else
    2185     UNUSED_PARAM(identifier);
    2186     UNUSED_PARAM(encode);
    2187     UNUSED_PARAM(content);
    2188 #endif
    2189 }
    2190 
    21911810void InspectorController::reloadPage()
    21921811{

  • trunk/WebCore/inspector/InspectorController.h

    r71017 r71035  
    8787class StorageArea;
    8888
    89 #define LEGACY_RESOURCE_TRACKING_ENABLED 0
    90 
    91 #if LEGACY_RESOURCE_TRACKING_ENABLED
    92 class InspectorResource;
    93 #endif
    94 
    9589#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    9690class InspectorApplicationCacheAgent;
    … …  
    108102class InspectorController : public Noncopyable {
    109103public:
    110 #if LEGACY_RESOURCE_TRACKING_ENABLED
    111     typedef HashMap<unsigned long, RefPtr<InspectorResource> > ResourcesMap;
    112     typedef HashMap<RefPtr<Frame>, ResourcesMap*> FrameResourcesMap;
    113 #endif
    114104    typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
    115105    typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
    … …  
    180170    void scriptImported(unsigned long identifier, const String& sourceString);
    181171
    182     void setResourceTrackingEnabled(bool enabled, bool always, bool* newState);
    183 #if LEGACY_RESOURCE_TRACKING_ENABLED
    184     void setResourceTrackingEnabled(bool enabled);
    185     bool resourceTrackingEnabled() const;
    186 #endif
    187 
    188172    void ensureSettingsLoaded();
    189173
    … …  
    229213    void didReceiveWebSocketHandshakeResponse(unsigned long identifier, const WebSocketHandshakeResponse&);
    230214    void didCloseWebSocket(unsigned long identifier);
    231 #endif
    232 
    233 #if LEGACY_RESOURCE_TRACKING_ENABLED
    234     const ResourcesMap& resources() const { return m_resources; }
    235215#endif
    236216
    … …  
    333313    void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
    334314
    335 #if LEGACY_RESOURCE_TRACKING_ENABLED
    336     void addResource(InspectorResource*);
    337     void removeResource(InspectorResource*);
    338     InspectorResource* getTrackedResource(unsigned long identifier);
    339     void pruneResources(ResourcesMap*, DocumentLoader* loaderToKeep = 0);
    340     void removeAllResources(ResourcesMap* map) { pruneResources(map); }
    341 #endif
    342     void getResourceContent(unsigned long identifier, bool encode, String* content);
    343 
    344315    bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl);
    345316
    … …  
    373344
    374345    RefPtr<Node> m_nodeToFocus;
    375 #if LEGACY_RESOURCE_TRACKING_ENABLED
    376     RefPtr<InspectorResource> m_mainResource;
    377     ResourcesMap m_resources;
    378     HashSet<String> m_knownResources;
    379     FrameResourcesMap m_frameResources;
    380 #endif
    381346    RefPtr<InspectorResourceAgent> m_resourceAgent;
    382347    unsigned long m_mainResourceIdentifier;

  • trunk/WebCore/inspector/InspectorFrontendHost.cpp

    r66720 r71035  
    4343#include "HTMLFrameOwnerElement.h"
    4444#include "InspectorFrontendClient.h"
    45 #include "InspectorResource.h"
    4645#include "Page.h"
    4746#include "Pasteboard.h"

  • trunk/WebCore/inspector/InspectorResourceAgent.cpp

    r70853 r71035  
    330330}
    331331
    332 void InspectorResourceAgent::setOverrideContent(unsigned long identifier, const String& sourceString, InspectorResource::Type type)
    333 {
    334     String typeString;
    335     switch (type) {
    336     case InspectorResource::XHR:
    337         typeString = "XHR";
    338         break;
    339     case InspectorResource::Script:
    340         typeString = "Script";
    341         break;
    342     default:
    343         typeString = "Other";
    344     }
    345 
    346     m_frontend->setOverrideContent(identifier, sourceString, typeString);
     332void InspectorResourceAgent::setOverrideContent(unsigned long identifier, const String& sourceString, const String& type)
     333{
     334    m_frontend->setOverrideContent(identifier, sourceString, type);
    347335}
    348336

  • trunk/WebCore/inspector/InspectorResourceAgent.h

    r70762 r71035  
    3232#define InspectorResourceAgent_h
    3333
    34 #include "InspectorResource.h"
    3534#include "PlatformString.h"
    3635
    … …  
    4948class Document;
    5049class DocumentLoader;
     50class Frame;
    5151class InspectorArray;
    5252class InspectorObject;
    … …  
    8686    void didFailLoading(unsigned long identifier, const ResourceError&);
    8787    void didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*);
    88     void setOverrideContent(unsigned long identifier, const String& sourceString, InspectorResource::Type);
     88    void setOverrideContent(unsigned long identifier, const String& sourceString, const String& type);
    8989    void didCommitLoad(DocumentLoader*);
    9090    void frameDetachedFromParent(Frame*);

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

    r70622 r71035  
    219219        if (msg instanceof WebInspector.ConsoleMessage && !(msg instanceof WebInspector.ConsoleCommandResult)) {
    220220            this._incrementErrorWarningCount(msg);
    221 
    222             // Add message to the resource panel
    223             if (!Preferences.networkPanelEnabled) {
    224                 var resource = WebInspector.resourceForURL(msg.url);
    225                 if (resource) {
    226                     msg.resource = resource;
    227                     if (WebInspector.panels.resources)
    228                         WebInspector.panels.resources.addMessageToResource(msg.resource, msg);
    229                 }
    230             } else
    231                 WebInspector.resourceManager.addConsoleMessage(msg);
    232 
     221            WebInspector.resourceManager.addConsoleMessage(msg);
    233222            this.commandSincePreviousMessage = false;
    234223            this.previousMessage = msg;
    … …  
    301290    clearMessages: function()
    302291    {
    303         if (WebInspector.panels.resources)
    304             WebInspector.panels.resources.clearMessages();
    305         if (WebInspector.resourceManager)
    306             WebInspector.resourceManager.clearConsoleMessages();
     292        WebInspector.resourceManager.clearConsoleMessages();
    307293
    308294        this.messages = [];

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

    r70762 r71035  
    244244        if (!resource)
    245245            return this._status.E_NOTFOUND(typeof id + ": " + id);
    246         if (Preferences.networkPanelEnabled) {
    247             WebInspector.panels.storage.showResource(resource, message.line);
    248             WebInspector.showPanel("storage");
    249         } else {
    250             WebInspector.panels.resources.showResource(resource, message.line);
    251             WebInspector.showPanel("resources");
    252         }
     246
     247        WebInspector.panels.storage.showResource(resource, message.line);
     248        WebInspector.showPanel("storage");
    253249    },
    254250

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

    r71010 r71035  
    650650
    651651WebInspector.Resource.prototype.__proto__ = WebInspector.Object.prototype;
    652 
    653 WebInspector.Resource.CompareByStartTime = function(a, b)
    654 {
    655     return a.startTime - b.startTime;
    656 }
    657 
    658 WebInspector.Resource.CompareByResponseReceivedTime = function(a, b)
    659 {
    660     var aVal = a.responseReceivedTime;
    661     var bVal = b.responseReceivedTime;
    662     if (aVal === -1 ^ bVal === -1)
    663         return bVal - aVal;
    664     return aVal - bVal;
    665 }
    666 
    667 WebInspector.Resource.CompareByEndTime = function(a, b)
    668 {
    669     var aVal = a.endTime;
    670     var bVal = b.endTime;
    671     if (aVal === -1 ^ bVal === -1)
    672         return bVal - aVal;
    673     return aVal - bVal;
    674 }
    675 
    676 WebInspector.Resource.CompareByDuration = function(a, b)
    677 {
    678     return a.duration - b.duration;
    679 }
    680 
    681 WebInspector.Resource.CompareByLatency = function(a, b)
    682 {
    683     return a.latency - b.latency;
    684 }
    685 
    686 WebInspector.Resource.CompareBySize = function(a, b)
    687 {
    688     return a.resourceSize - b.resourceSize;
    689 }
    690 
    691 WebInspector.Resource.CompareByTransferSize = function(a, b)
    692 {
    693     return a.transferSize - b.transferSize;
    694 }

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

    r71010 r71035  
    473473WebInspector.ResourceManager.getContent = function(resource, base64Encode, callback)
    474474{
    475     // FIXME: eventually, cached resources will have no identifiers.
    476     if (Preferences.networkPanelEnabled)
    477         InspectorBackend.resourceContent(resource.loader.frameId, resource.url, base64Encode, callback);
    478     else
    479         InspectorBackend.getResourceContent(resource.identifier, base64Encode, callback);
     475    InspectorBackend.resourceContent(resource.loader.frameId, resource.url, base64Encode, callback);
    480476}
    481477

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

    r71010 r71035  
    4646    nativeInstrumentationEnabled: false,
    4747    resourceExportEnabled: false,
    48     networkPanelEnabled: true,
    4948    fileSystemEnabled: false,
    5049    useDataURLForResourceImageIcons: true

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

    r71010 r71035  
    3838    this.sidebarTreeElement.removeStyleClass("sidebar-tree");
    3939
    40     if (Preferences.networkPanelEnabled) {
    41         this.resourcesListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Frames"), "Frames", "frame-storage-tree-item");
    42         this.sidebarTree.appendChild(this.resourcesListTreeElement);
    43         this._treeElementForFrameId = {};
    44     }
     40    this.resourcesListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Frames"), "Frames", "frame-storage-tree-item");
     41    this.sidebarTree.appendChild(this.resourcesListTreeElement);
     42    this._treeElementForFrameId = {};
    4543
    4644    this.databasesListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Databases"), "Databases", "database-storage-tree-item");
    … …  
    8280    get toolbarItemLabel()
    8381    {
    84         return Preferences.networkPanelEnabled ? WebInspector.UIString("Resources") : WebInspector.UIString("Storage");
     82        return WebInspector.UIString("Resources");
    8583    },
    8684
    … …  
    633631        var views = [];
    634632
    635         if (!Preferences.networkPanelEnabled)
    636             return views;
    637 
    638633        const visibleView = this.visibleView;
    639634        if (visibleView instanceof WebInspector.ResourceView && visibleView.performSearch)

  • trunk/WebCore/inspector/front-end/WebKit.qrc

    r70956 r71035  
    7272    <file>ResourceCategory.js</file>
    7373    <file>ResourceManager.js</file>
    74     <file>ResourcesPanel.js</file>
    7574    <file>ResourceView.js</file>
    7675    <file>ScopeChainSidebarPane.js</file>

  • trunk/WebCore/inspector/front-end/inspector.html

    r70956 r71035  
    9797    <script type="text/javascript" src="ElementsPanel.js"></script>
    9898    <script type="text/javascript" src="NetworkPanel.js"></script>
    99     <script type="text/javascript" src="ResourcesPanel.js"></script>
    10099    <script type="text/javascript" src="InjectedFakeWorker.js"></script>
    101100    <script type="text/javascript" src="ScriptsPanel.js"></script>

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

    r71010 r71035  
    225225            this.panels.elements = new WebInspector.ElementsPanel();
    226226
    227         if (Preferences.networkPanelEnabled) {
    228             if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
    229                 this.panels.storage = new WebInspector.StoragePanel();
    230             if (hiddenPanels.indexOf("network") === -1)
    231                 this.panels.network = new WebInspector.NetworkPanel();
    232         } else if (hiddenPanels.indexOf("resources") === -1)
    233             this.panels.resources = new WebInspector.ResourcesPanel();
    234 
    235         if (Preferences.networkPanelEnabled && hiddenPanels.indexOf("network") === -1)
     227        if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
     228            this.panels.storage = new WebInspector.StoragePanel();
     229        if (hiddenPanels.indexOf("network") === -1)
    236230            this.panels.network = new WebInspector.NetworkPanel();
    237231        if (hiddenPanels.indexOf("scripts") === -1)
    … …  
    245239                this.panels.profiles.registerProfileType(new WebInspector.HeapSnapshotProfileType());
    246240        }
    247 
    248         if (!Preferences.networkPanelEnabled) {
    249             if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
    250                 this.panels.storage = new WebInspector.StoragePanel();
    251         }
    252 
    253241        if (hiddenPanels.indexOf("audits") === -1)
    254242            this.panels.audits = new WebInspector.AuditsPanel();
    … …  
    454442    get networkResources()
    455443    {
    456         if (Preferences.networkPanelEnabled)
    457             return this.panels.network.resources;
    458         else
    459             return this.resources;
     444        return this.panels.network.resources;
    460445    },
    461446
    462447    forAllResources: function(callback)
    463448    {
    464         if (Preferences.networkPanelEnabled)
    465             WebInspector.resourceManager.forAllResources(callback);
    466         else {
    467             for (var id in this.resources) {
    468                 if (callback(this.resources[id]))
    469                     return;
    470             }
    471         }
     449        WebInspector.resourceManager.forAllResources(callback);
    472450    },
    473451
    474452    resourceForURL: function(url)
    475453    {
    476         if (Preferences.networkPanelEnabled)
    477             return this.resourceManager.resourceForURL(url);
    478         return this.panels.resources.resourceURLMap[url];
     454        return this.resourceManager.resourceForURL(url);
    479455    }
    480456}
    … …  
    543519    // TODO: Remove class="hidden" from inspector.html on button#changes-status-bar-item
    544520    this.drawer.visibleView = this.console;
    545     if (Preferences.networkPanelEnabled)
    546         this.resourceManager = new WebInspector.ResourceManager();
     521    this.resourceManager = new WebInspector.ResourceManager();
    547522    this.domAgent = new WebInspector.DOMAgent();
    548523
    … …  
    572547        previousToolbarItem = WebInspector.addPanelToolbarIcon(toolbarElement, this.panels[panelName], previousToolbarItem);
    573548
    574     if (Preferences.networkPanelEnabled) {
    575         this.panels.storage._toolbarItem.removeStyleClass("storage");
    576         this.panels.storage._toolbarItem.addStyleClass("resources");
    577     }
     549    // FIXME: fix this once renated StoragePanel.js to ResourcesPanel.js
     550    this.panels.storage._toolbarItem.removeStyleClass("storage");
     551    this.panels.storage._toolbarItem.addStyleClass("resources");
    578552
    579553    this.Tips = {
    … …  
    629603        if ("pauseOnExceptionsState" in inspectorState)
    630604            WebInspector.panels.scripts.updatePauseOnExceptionsState(inspectorState.pauseOnExceptionsState);
    631         if (WebInspector.panels.resources) {
    632             if (inspectorState.resourceTrackingEnabled)
    633                 WebInspector.panels.resources.resourceTrackingWasEnabled();
    634             else
    635                 WebInspector.panels.resources.resourceTrackingWasDisabled();
    636         }
    637605    }
    638606    InspectorBackend.getInspectorState(populateInspectorState);
    … …  
    843811    var resource = WebInspector.resourceForURL(resourceURL);
    844812    if (inResourcesPanel && resource) {
    845         if (Preferences.networkPanelEnabled) {
    846             WebInspector.panels.storage.showResource(resource);
    847             WebInspector.showPanel("storage");
    848         } else {
    849             WebInspector.panels.resources.showResource(resource);
    850             WebInspector.showPanel("resources");
    851         }
     813        WebInspector.panels.storage.showResource(resource);
     814        WebInspector.showPanel("storage");
    852815    } else
    853816        InspectorBackend.openInInspectedWindow(resource ? resource.url : resourceURL);
    … …  
    12661229}
    12671230
    1268 WebInspector.updateResource = function(payload)
    1269 {
    1270     if (Preferences.networkPanelEnabled)
    1271         return;
    1272 
    1273     var identifier = payload.id;
    1274     var resource = this.resources[identifier];
    1275     if (!resource) {
    1276         resource = new WebInspector.Resource(identifier, payload.url);
    1277         this.resources[identifier] = resource;
    1278         this.panels.resources.addResource(resource);
    1279         this.panels.audits.resourceStarted(resource);
    1280     }
    1281 
    1282     if (payload.didRequestChange) {
    1283         resource.requestHeaders = payload.requestHeaders;
    1284         resource.mainResource = payload.mainResource;
    1285         resource.requestMethod = payload.requestMethod;
    1286         resource.requestFormData = payload.requestFormData;
    1287         resource.documentURL = payload.documentURL;
    1288         if (typeof payload.webSocketRequestKey3 !== "undefined")
    1289             resource.webSocketRequestKey3 = payload.webSocketRequestKey3;
    1290 
    1291         if (resource.mainResource)
    1292             this.mainResource = resource;
    1293 
    1294         this.panels.storage.addDocumentURL(payload.documentURL);
    1295     }
    1296 
    1297     if (payload.didResponseChange) {
    1298         resource.mimeType = payload.mimeType;
    1299         resource.suggestedFilename = payload.suggestedFilename;
    1300         resource.expectedContentLength = payload.expectedContentLength;
    1301         resource.statusCode = payload.statusCode;
    1302         resource.statusText = payload.statusText;
    1303         resource.suggestedFilename = payload.suggestedFilename;
    1304         resource.responseHeaders = payload.responseHeaders;
    1305         resource.connectionID = payload.connectionID;
    1306         resource.connectionReused = payload.connectionReused;
    1307         resource.timing = payload.timing;
    1308         resource.cached = payload.cached;
    1309         if (typeof payload.webSocketChallengeResponse !== "undefined")
    1310             resource.webSocketChallengeResponse = payload.webSocketChallengeResponse;
    1311     }
    1312 
    1313     if (payload.didTypeChange)
    1314         resource.type = payload.type;
    1315 
    1316     if (payload.didLengthChange)
    1317         resource.resourceSize = payload.resourceSize;
    1318 
    1319     if (payload.didCompletionChange) {
    1320         resource.failed = payload.failed;
    1321         resource.localizedFailDescription = payload.localizedFailDescription;
    1322         resource.finished = payload.finished;
    1323         if (this.panels.audits)
    1324             this.panels.audits.resourceFinished(resource);
    1325         this.extensionServer.notifyResourceFinished(resource);
    1326     }
    1327 
    1328     if (payload.didTimingChange) {
    1329         if (payload.startTime)
    1330             resource.startTime = payload.startTime;
    1331         if (payload.responseReceivedTime)
    1332             resource.responseReceivedTime = payload.responseReceivedTime;
    1333         if (payload.endTime)
    1334             resource.endTime = payload.endTime;
    1335     }
    1336     this.panels.resources.refreshResource(resource);
    1337 }
    1338 
    13391231WebInspector.domContentEventFired = function(time)
    13401232{
    1341     if (this.panels.resources)
    1342         this.panels.resources.mainResourceDOMContentTime = time;
    13431233    this.panels.audits.mainResourceDOMContentTime = time;
    13441234    if (this.panels.network)
    … …  
    13491239WebInspector.loadEventFired = function(time)
    13501240{
    1351     if (this.panels.resources)
    1352         this.panels.resources.mainResourceLoadTime = time;
    13531241    this.panels.audits.mainResourceLoadTime = time;
    13541242    if (this.panels.network)
    13551243        this.panels.network.mainResourceLoadTime = time;
    13561244    this.mainResourceLoadTime = time;
    1357 }
    1358 
    1359 WebInspector.removeResource = function(identifier)
    1360 {
    1361     if (Preferences.networkPanelEnabled)
    1362         return;
    1363 
    1364     var resource = this.resources[identifier];
    1365     if (!resource)
    1366         return;
    1367 
    1368     delete this.resources[identifier];
    1369 
    1370     if (this.panels.resources)
    1371         this.panels.resources.removeResource(resource);
    13721245}
    13731246
    … …  
    14981371    this.fileSystemOrigins = {};
    14991372    this.highlightDOMNode(0);
    1500 
    1501     if (!Preferences.networkPanelEnabled)
    1502         delete this.mainResource;
    15031373
    15041374    this.console.clearMessages();
    … …  
    17311601{
    17321602    preferredPanel = preferredPanel || "resources";
    1733     if (Preferences.networkPanelEnabled && preferredPanel === "resources")
     1603    // FIXME: remove this once StoragePanel renamed to ResourcesPanel
     1604    if (preferredPanel === "resources")
    17341605        preferredPanel = "storage";
    17351606
    … …  
    17371608    if (panel && panel.canShowSourceLine(url, line))
    17381609        return panel;
    1739     panel = Preferences.networkPanelEnabled ? this.panels.storage : this.panels.resources;
     1610    panel = this.panels.storage;
    17401611    return panel.canShowSourceLine(url, line) ? panel : null;
    17411612}

  • trunk/WebKit/chromium/ChangeLog

    r71019 r71035  
     12010-11-01  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Timothy Hatcher.
     4
     5        Web Inspector: remove old resources panel.
     6        https://bugs.webkit.org/show_bug.cgi?id=45657
     7
     8        * src/WebDevToolsAgentImpl.cpp:
     9        (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
     10        * src/WebDevToolsAgentImpl.h:
     11
    1122010-11-01  Leandro Gracia Gil  <leandrogracia@google.com>
    213

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r71010 r71035  
    266266            connectFrontend(true);
    267267
    268 #if LEGACY_RESOURCE_TRACKING_ENABLED
    269         m_resourceTrackingWasEnabled = ic->resourceTrackingEnabled();
    270 #endif
    271268        ic->startTimelineProfiler();
    272 #if LEGACY_RESOURCE_TRACKING_ENABLED
    273         if (!m_resourceTrackingWasEnabled) {
    274             // TODO(knorton): Introduce some kind of agents dependency here so that
    275             // user could turn off resource tracking while apu agent is on.
    276             ic->setResourceTrackingEnabled(true);
    277         }
    278 #endif
    279269        m_debuggerAgentImpl->setAutoContinueOnException(true);
    280     } else {
     270    } else
    281271      ic->stopTimelineProfiler();
    282 #if LEGACY_RESOURCE_TRACKING_ENABLED       
    283       if (!m_resourceTrackingWasEnabled)
    284           ic->setResourceTrackingEnabled(false);
    285       m_resourceTrackingWasEnabled = false;
    286 #endif
    287     }
     272
    288273    m_client->runtimePropertyChanged(
    289274        kApuAgentFeatureName,

  • trunk/WebKit/chromium/src/WebDevToolsAgentImpl.h

    r67852 r71035  
    110110    OwnPtr<DebuggerAgentImpl> m_debuggerAgentImpl;
    111111    bool m_apuAgentEnabled;
    112     bool m_resourceTrackingWasEnabled;
    113112    bool m_attached;
    114113};
Note: See TracChangeset for help on using the changeset viewer.