Changeset 78234 in webkit


Ignore:
Timestamp:
Feb 10, 2011 9:43:48 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2011-02-09 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: Remove FileSystem support from the inspector.
​https://bugs.webkit.org/show_bug.cgi?id=50695

  • CMakeLists.txt:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • inspector/Inspector.idl:
  • inspector/InspectorApplicationCacheAgent.cpp: (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent): (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
  • inspector/InspectorApplicationCacheAgent.h:
  • inspector/InspectorFileSystemAgent.cpp: Removed.
  • inspector/InspectorFileSystemAgent.h: Removed.
  • inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::identifierForInitialRequestImpl): (WebCore::InspectorInstrumentation::willSendRequestImpl): (WebCore::InspectorInstrumentation::markResourceAsCachedImpl): (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl): (WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl): (WebCore::InspectorInstrumentation::didReceiveContentLengthImpl): (WebCore::InspectorInstrumentation::didFinishLoadingImpl): (WebCore::InspectorInstrumentation::didFailLoadingImpl): (WebCore::InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl): (WebCore::InspectorInstrumentation::scriptImportedImpl): (WebCore::InspectorInstrumentation::networkStateChangedImpl): (WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl): (WebCore::InspectorInstrumentation::retrieveResourceAgent):
  • inspector/front-end/FileSystemView.js: Removed.
  • inspector/front-end/WebKit.qrc:
  • inspector/front-end/inspector.html:
Location:
trunk/Source/WebCore
Files:
3 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r78194 r78234  
    10311031    inspector/InspectorDatabaseResource.cpp
    10321032    inspector/InspectorDebuggerAgent.cpp
    1033     inspector/InspectorFileSystemAgent.cpp
    10341033    inspector/InspectorFrontendClientLocal.cpp
    10351034    inspector/InspectorFrontendHost.cpp

  • trunk/Source/WebCore/ChangeLog

    r78232 r78234  
     12011-02-09  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: Remove FileSystem support from the inspector.
     6        https://bugs.webkit.org/show_bug.cgi?id=50695
     7
     8        * CMakeLists.txt:
     9        * GNUmakefile.am:
     10        * WebCore.gypi:
     11        * WebCore.pro:
     12        * WebCore.vcproj/WebCore.vcproj:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * inspector/Inspector.idl:
     15        * inspector/InspectorApplicationCacheAgent.cpp:
     16        (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
     17        (WebCore::InspectorApplicationCacheAgent::getApplicationCaches):
     18        * inspector/InspectorApplicationCacheAgent.h:
     19        * inspector/InspectorFileSystemAgent.cpp: Removed.
     20        * inspector/InspectorFileSystemAgent.h: Removed.
     21        * inspector/InspectorInstrumentation.cpp:
     22        (WebCore::InspectorInstrumentation::identifierForInitialRequestImpl):
     23        (WebCore::InspectorInstrumentation::willSendRequestImpl):
     24        (WebCore::InspectorInstrumentation::markResourceAsCachedImpl):
     25        (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl):
     26        (WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl):
     27        (WebCore::InspectorInstrumentation::didReceiveContentLengthImpl):
     28        (WebCore::InspectorInstrumentation::didFinishLoadingImpl):
     29        (WebCore::InspectorInstrumentation::didFailLoadingImpl):
     30        (WebCore::InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl):
     31        (WebCore::InspectorInstrumentation::scriptImportedImpl):
     32        (WebCore::InspectorInstrumentation::networkStateChangedImpl):
     33        (WebCore::InspectorInstrumentation::updateApplicationCacheStatusImpl):
     34        (WebCore::InspectorInstrumentation::retrieveResourceAgent):
     35        * inspector/front-end/FileSystemView.js: Removed.
     36        * inspector/front-end/WebKit.qrc:
     37        * inspector/front-end/inspector.html:
     38
    1392011-02-10  Sheriff Bot  <webkit.review.bot@gmail.com>
    240

  • trunk/Source/WebCore/GNUmakefile.am

    r78194 r78234  
    19881988        Source/WebCore/inspector/InspectorDOMStorageResource.cpp \
    19891989        Source/WebCore/inspector/InspectorDOMStorageResource.h \
    1990         Source/WebCore/inspector/InspectorFileSystemAgent.cpp \
    1991         Source/WebCore/inspector/InspectorFileSystemAgent.h \
    19921990        Source/WebCore/inspector/InspectorFrontendClient.h \
    19931991        Source/WebCore/inspector/InspectorFrontendClientLocal.cpp \

  • trunk/Source/WebCore/WebCore.gypi

    r78194 r78234  
    20462046            'inspector/InspectorDOMStorageResource.cpp',
    20472047            'inspector/InspectorDOMStorageResource.h',
    2048             'inspector/InspectorFileSystemAgent.cpp',
    2049             'inspector/InspectorFileSystemAgent.h',
    20502048            'inspector/InspectorFrontendClient.h',
    20512049            'inspector/InspectorFrontendHost.cpp',
    … …  
    46974695            'inspector/front-end/ExtensionRegistryStub.js',
    46984696            'inspector/front-end/ExtensionServer.js',
    4699             'inspector/front-end/FileSystemView.js',
    47004697            'inspector/front-end/FontView.js',
    47014698            'inspector/front-end/GoToLineDialog.js',

  • trunk/Source/WebCore/WebCore.pro

    r78194 r78234  
    10611061    inspector/InspectorDOMStorageAgent.cpp \
    10621062    inspector/InspectorDOMStorageResource.cpp \
    1063     inspector/InspectorFileSystemAgent.cpp \
    10641063    inspector/InspectorFrontendClientLocal.cpp \
    10651064    inspector/InspectorFrontendHost.cpp \

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

    r78194 r78234  
    6545565455                        </File>
    6545665456                        <File
    65457                                 RelativePath="..\inspector\InspectorFileSystemAgent.cpp"
    65458                                 >
    65459                         </File>
    65460                         <File
    65461                                 RelativePath="..\inspector\InspectorFileSystemAgent.h"
    65462                                 >
    65463                         </File>
    65464                         <File
    6546565457                                RelativePath="..\inspector\InspectorFrontendClient.h"
    6546665458                                >
    … …  
    6577165763                                <File
    6577265764                                        RelativePath="..\inspector\front-end\ExtensionServer.js"
    65773                                         >
    65774                                 </File>
    65775                                 <File
    65776                                         RelativePath="..\inspector\front-end\FileSystemView.js"
    6577765765                                        >
    6577865766                                </File>

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

    r78194 r78234  
    861861                37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; };
    862862                37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; };
    863                 3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */; };
    864                 3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */; };
    865863                3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; };
    866864                41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; };
    … …  
    72267224                37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; };
    72277225                37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = "<group>"; };
    7228                 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = "<group>"; };
    7229                 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = "<group>"; };
    72307226                3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = "<group>"; };
    72317227                41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
    … …  
    1301213008                                41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
    1301313009                                41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
    13014                                 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */,
    13015                                 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */,
    1301613010                                F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
    1301713011                                F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
    … …  
    2092720921                                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
    2092820922                                41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
    20929                                 3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */,
    2093020923                                F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
    2093120924                                F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
    … …  
    2366023653                                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
    2366123654                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
    23662                                 3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */,
    2366323655                                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
    2366423656                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,

  • trunk/Source/WebCore/inspector/Inspector.idl

    r78212 r78234  
    152152#endif
    153153
    154 #if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM
    155     interface [Conditional=INSPECTOR] FileSystem {
    156         void getFileSystemPathAsync(in unsigned int type, in String origin);
    157         void revealFolderInOS(in String path);
    158 
    159         [notify] void didGetFileSystemPath(out String root, out int type, out String origin);
    160         [notify] void didGetFileSystemError(out int type, out String origin);
    161         [notify] void didGetFileSystemDisabled();
    162     };
    163 #endif
    164 
    165154    interface [Conditional=INSPECTOR] DOM {
    166155        void getChildNodes(in long nodeId);

  • trunk/Source/WebCore/inspector/InspectorAgent.cpp

    r78056 r78234  
    121121#endif
    122122
    123 #if ENABLE(FILE_SYSTEM)
    124 #include "InspectorFileSystemAgent.h"
    125 #endif
    126 
    127123using namespace std;
    128124
    … …  
    404400
    405401#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    406     m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend);
    407 #endif
    408 
    409 #if ENABLE(FILE_SYSTEM)
    410     m_fileSystemAgent = InspectorFileSystemAgent::create(this, m_frontend);
     402    m_applicationCacheAgent = new InspectorApplicationCacheAgent(m_inspectedPage->mainFrame()->loader()->documentLoader(), m_frontend);
    411403#endif
    412404}
    … …  
    440432#endif
    441433
    442 #if ENABLE(FILE_SYSTEM)
    443     if (m_fileSystemAgent)
    444         m_fileSystemAgent->stop();
    445         m_fileSystemAgent.clear();
    446 #endif
    447434    stopTimelineProfiler();
    448435}
    … …  
    545532    if (m_resourceAgent)
    546533        m_resourceAgent->didCommitLoad(loader);
    547    
     534
    548535    ASSERT(m_inspectedPage);
    549536
    … …  
    554541        m_injectedScriptHost->discardInjectedScripts();
    555542        m_consoleAgent->reset();
     543
     544#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     545        if (m_applicationCacheAgent)
     546            m_applicationCacheAgent->didCommitLoad(loader);
     547#endif
    556548
    557549#if ENABLE(JAVASCRIPT_DEBUGGER)

  • trunk/Source/WebCore/inspector/InspectorAgent.h

    r78056 r78234  
    9595#endif
    9696
    97 #if ENABLE(FILE_SYSTEM)
    98 class InspectorFileSystemAgent;
    99 #endif
    100 
    10197#if ENABLE(WEB_SOCKETS)
    10298class WebSocketHandshakeRequest;
    … …  
    153149#if ENABLE(DOM_STORAGE)
    154150    InspectorDOMStorageAgent* domStorageAgent() { return m_domStorageAgent.get(); }
    155 #endif
    156 #if ENABLE(FILE_SYSTEM)
    157     InspectorFileSystemAgent* fileSystemAgent() { return m_fileSystemAgent.get(); }
    158151#endif
    159152#if ENABLE(JAVASCRIPT_DEBUGGER)
    … …  
    296289#endif
    297290
    298 #if ENABLE(FILE_SYSTEM)
    299     RefPtr<InspectorFileSystemAgent> m_fileSystemAgent;
    300 #endif
    301 
    302291    RefPtr<Node> m_highlightedNode;
    303292    RefPtr<Node> m_nodeToFocus;

  • trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp

    r76459 r78234  
    4242namespace WebCore {
    4343
    44 InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorAgent* inspectorAgent, InspectorFrontend* frontend)
    45     : m_inspectorAgent(inspectorAgent)
     44InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(DocumentLoader* documentLoader, InspectorFrontend* frontend)
     45    : m_documentLoader(documentLoader)
    4646    , m_frontend(frontend)
    4747{
     48}
     49
     50void InspectorApplicationCacheAgent::didCommitLoad(DocumentLoader* documentLoader)
     51{
     52    m_documentLoader = documentLoader;
    4853}
    4954
    … …  
    6267void InspectorApplicationCacheAgent::getApplicationCaches(RefPtr<InspectorValue>* applicationCaches)
    6368{
    64     DocumentLoader* documentLoader = m_inspectorAgent->inspectedPage()->mainFrame()->loader()->documentLoader();
    65     if (documentLoader) {
    66         ApplicationCacheHost* host = documentLoader->applicationCacheHost();
     69    if (m_documentLoader) {
     70        ApplicationCacheHost* host = m_documentLoader->applicationCacheHost();
    6771        ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
    6872

  • trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h

    r76459 r78234  
    3434namespace WebCore {
    3535
     36class DocumentLoader;
    3637class Frame;
    3738class InspectorArray;
    … …  
    4546    WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
    4647public:
    47     InspectorApplicationCacheAgent(InspectorAgent*, InspectorFrontend*);
     48    InspectorApplicationCacheAgent(DocumentLoader*, InspectorFrontend*);
    4849    ~InspectorApplicationCacheAgent() { }
     50
     51    void didCommitLoad(DocumentLoader*);
    4952
    5053    // Backend to Frontend
    … …  
    6063    PassRefPtr<InspectorObject> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
    6164
    62     InspectorAgent* m_inspectorAgent;
     65    DocumentLoader* m_documentLoader;
    6366    InspectorFrontend* m_frontend;
    6467};

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r77950 r78234  
    373373}
    374374
    375 void InspectorInstrumentation::identifierForInitialRequestImpl(InspectorAgent* ic, unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
    376 {
    377     if (!ic->enabled())
     375void InspectorInstrumentation::identifierForInitialRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
     376{
     377    if (!inspectorAgent->enabled())
    378378        return;
    379379
    380     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     380    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    381381        resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
    382382}
    … …  
    387387}
    388388
    389 void InspectorInstrumentation::willSendRequestImpl(InspectorAgent* ic, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
    390 {
    391     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
     389void InspectorInstrumentation::willSendRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
     390{
     391    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
    392392        timelineAgent->willSendResourceRequest(identifier, request);
    393     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     393    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    394394        resourceAgent->willSendRequest(identifier, request, redirectResponse);
    395395}
    396396
    397 void InspectorInstrumentation::markResourceAsCachedImpl(InspectorAgent* ic, unsigned long identifier)
    398 {
    399     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     397void InspectorInstrumentation::markResourceAsCachedImpl(InspectorAgent* inspectorAgent, unsigned long identifier)
     398{
     399    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    400400        resourceAgent->markResourceAsCached(identifier);
    401401}
    402402
    403 void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InspectorAgent* ic, DocumentLoader* loader, const CachedResource* cachedResource)
    404 {
    405     if (!ic->enabled())
     403void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InspectorAgent* inspectorAgent, DocumentLoader* loader, const CachedResource* cachedResource)
     404{
     405    if (!inspectorAgent->enabled())
    406406        return;
    407     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     407    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    408408        resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
    409409}
    … …  
    439439void InspectorInstrumentation::didReceiveResourceResponseImpl(const InspectorInstrumentationCookie& cookie, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response)
    440440{
    441     InspectorAgent* ic = cookie.first;
    442     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     441    InspectorAgent* inspectorAgent = cookie.first;
     442    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    443443        resourceAgent->didReceiveResponse(identifier, loader, response);
    444     ic->consoleAgent()->didReceiveResponse(identifier, response);
     444    inspectorAgent->consoleAgent()->didReceiveResponse(identifier, response);
    445445    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
    446446        timelineAgent->didReceiveResourceResponse();
    447447}
    448448
    449 void InspectorInstrumentation::didReceiveContentLengthImpl(InspectorAgent* ic, unsigned long identifier, int lengthReceived)
    450 {
    451     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     449void InspectorInstrumentation::didReceiveContentLengthImpl(InspectorAgent* inspectorAgent, unsigned long identifier, int lengthReceived)
     450{
     451    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    452452        resourceAgent->didReceiveContentLength(identifier, lengthReceived);
    453453}
    454454
    455 void InspectorInstrumentation::didFinishLoadingImpl(InspectorAgent* ic, unsigned long identifier, double finishTime)
    456 {
    457     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
     455void InspectorInstrumentation::didFinishLoadingImpl(InspectorAgent* inspectorAgent, unsigned long identifier, double finishTime)
     456{
     457    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
    458458        timelineAgent->didFinishLoadingResource(identifier, false, finishTime);
    459     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     459    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    460460        resourceAgent->didFinishLoading(identifier, finishTime);
    461461}
    462462
    463 void InspectorInstrumentation::didFailLoadingImpl(InspectorAgent* ic, unsigned long identifier, const ResourceError& error)
    464 {
    465     ic->consoleAgent()->didFailLoading(identifier, error);
    466     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
     463void InspectorInstrumentation::didFailLoadingImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const ResourceError& error)
     464{
     465    inspectorAgent->consoleAgent()->didFailLoading(identifier, error);
     466    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
    467467        timelineAgent->didFinishLoadingResource(identifier, true, 0);
    468     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     468    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    469469        resourceAgent->didFailLoading(identifier, error);
    470470}
    471471
    472 void InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl(InspectorAgent* ic, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
    473 {
    474     ic->consoleAgent()->resourceRetrievedByXMLHttpRequest(url, sendURL, sendLineNumber);
    475     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     472void InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
     473{
     474    inspectorAgent->consoleAgent()->resourceRetrievedByXMLHttpRequest(url, sendURL, sendLineNumber);
     475    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    476476        resourceAgent->setInitialContent(identifier, sourceString, "XHR");
    477477}
    478478
    479 void InspectorInstrumentation::scriptImportedImpl(InspectorAgent* ic, unsigned long identifier, const String& sourceString)
    480 {
    481     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
     479void InspectorInstrumentation::scriptImportedImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const String& sourceString)
     480{
     481    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
    482482        resourceAgent->setInitialContent(identifier, sourceString, "Script");
    483483}
    … …  
    632632
    633633#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    634 void InspectorInstrumentation::networkStateChangedImpl(InspectorAgent* ic)
    635 {
    636     if (InspectorApplicationCacheAgent* applicationCacheAgent = ic->applicationCacheAgent())
     634void InspectorInstrumentation::networkStateChangedImpl(InspectorAgent* inspectorAgent)
     635{
     636    if (InspectorApplicationCacheAgent* applicationCacheAgent = inspectorAgent->applicationCacheAgent())
    637637        applicationCacheAgent->networkStateChanged();
    638638}
    639639
    640 void InspectorInstrumentation::updateApplicationCacheStatusImpl(InspectorAgent* ic, Frame* frame)
    641 {
    642     if (InspectorApplicationCacheAgent* applicationCacheAgent = ic->applicationCacheAgent())
     640void InspectorInstrumentation::updateApplicationCacheStatusImpl(InspectorAgent* inspectorAgent, Frame* frame)
     641{
     642    if (InspectorApplicationCacheAgent* applicationCacheAgent = inspectorAgent->applicationCacheAgent())
    643643        applicationCacheAgent->updateApplicationCacheStatus(frame);
    644644}
    … …  
    679679}
    680680
    681 InspectorResourceAgent* InspectorInstrumentation::retrieveResourceAgent(InspectorAgent* ic)
    682 {
    683     return ic->resourceAgent();
     681InspectorResourceAgent* InspectorInstrumentation::retrieveResourceAgent(InspectorAgent* inspectorAgent)
     682{
     683    return inspectorAgent->resourceAgent();
    684684}
    685685

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

    r77480 r78234  
    5757    this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
    5858
    59     if (Preferences.fileSystemEnabled) {
    60         this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "FileSystem", "file-system-storage-tree-item");
    61         this.sidebarTree.appendChild(this.fileSystemListTreeElement);
    62         this.fileSystemListTreeElement.expand();
    63     }
    64 
    6559    this.storageViews = document.createElement("div");
    6660    this.storageViews.id = "storage-views";
    … …  
    155149
    156150        this._cookieViews = {};
    157         this._fileSystemView = null;
    158151       
    159152        this._applicationCacheView = null;
    … …  
    165158        this.cookieListTreeElement.removeChildren();
    166159        this.applicationCacheListTreeElement.removeChildren();
    167         if (Preferences.fileSystemEnabled)
    168             this.fileSystemListTreeElement.removeChildren();
    169160        this.storageViews.removeChildren();
    170161
    … …  
    299290            var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain);
    300291            this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);
    301         }
    302 
    303         if (Preferences.fileSystemEnabled) {
    304             // FIXME: This should match the SecurityOrigin::toString(), add a test for this.
    305             var securityOrigin = parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "");
    306             if (!this._origins[securityOrigin]) {
    307                 this._origins[securityOrigin] = true;
    308                 var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, securityOrigin);
    309                 this.fileSystemListTreeElement.appendChild(fileSystemTreeElement);
    310             }
    311292        }
    312293    },
    … …  
    490471    },
    491472
    492     showFileSystem: function(treeElement, origin)
    493     {
    494         this._fileSystemView = new WebInspector.FileSystemView(treeElement, origin);
    495         this._innerShowView(this._fileSystemView);
    496     },
    497    
    498473    showCategoryView: function(categoryName)
    499474    {
    … …  
    642617        if (this._applicationCacheView && this._applicationCacheView === this.visibleView)
    643618            this._applicationCacheView.updateStatus(status);
    644     },
    645 
    646     updateFileSystemPath: function(root, type, origin)
    647     {
    648         if (this._fileSystemView && this._fileSystemView === this.visibleView)
    649             this._fileSystemView.updateFileSystemPath(root, type, origin); 
    650     },
    651  
    652     updateFileSystemError: function(type, origin)
    653     {
    654         if (this._fileSystemView && this._fileSystemView === this.visibleView)
    655             this._fileSystemView.updateFileSystemError(type, origin); 
    656     },
    657    
    658     setFileSystemDisabled: function()
    659     {
    660         if (this._fileSystemView && this._fileSystemView === this.visibleView)
    661             this._fileSystemView.setFileSystemDisabled(); 
    662619    },
    663620
    … …  
    12841241WebInspector.ResourceRevisionTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
    12851242
    1286 WebInspector.FileSystemTreeElement = function(storagePanel, origin)
    1287 {
    1288     WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, origin, "file-system-storage-tree-item");
    1289     this._origin = origin;
    1290 }
    1291 
    1292 WebInspector.FileSystemTreeElement.prototype = {
    1293     get itemURL()
    1294     {
    1295         return "file-system://" + encodeURI(this._origin);
    1296     },
    1297 
    1298     onselect: function()
    1299     {
    1300         WebInspector.BaseStorageTreeElement.prototype.onselect.call(this);
    1301         this._storagePanel.showFileSystem(this, this._origin);
    1302     }
    1303 }
    1304  
    1305 WebInspector.FileSystemTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
    1306  
    13071243WebInspector.StorageCategoryView = function()
    13081244{

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

    r77489 r78234  
    4646    nativeInstrumentationEnabled: false,
    4747    resourceExportEnabled: false,
    48     fileSystemEnabled: false,
    4948    useDataURLForResourceImageIcons: true,
    5049    showTimingTab: false,

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

    r77810 r78234  
    4545    <file>ExtensionRegistryStub.js</file>
    4646    <file>ExtensionServer.js</file>
    47     <file>FileSystemView.js</file>
    4847    <file>FontView.js</file>
    4948    <file>GoToLineDialog.js</file>

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

    r77810 r78234  
    7373    <script type="text/javascript" src="CookieItemsView.js"></script>
    7474    <script type="text/javascript" src="ApplicationCacheItemsView.js"></script>
    75     <script type="text/javascript" src="FileSystemView.js"></script>
    7675    <script type="text/javascript" src="Script.js"></script>
    7776    <script type="text/javascript" src="Breakpoint.js"></script>
Note: See TracChangeset for help on using the changeset viewer.