2011-02-09 Pavel Feldman <pfeldman@chromium.org>
authorpfeldman@chromium.org <pfeldman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Feb 2011 17:43:48 +0000 (17:43 +0000)
committerpfeldman@chromium.org <pfeldman@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Feb 2011 17:43:48 +0000 (17:43 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78234 268f45cc-cd09-0410-ab3c-d52691b4dbfc

20 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/inspector/Inspector.idl
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorAgent.h
Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.h
Source/WebCore/inspector/InspectorFileSystemAgent.cpp [deleted file]
Source/WebCore/inspector/InspectorFileSystemAgent.h [deleted file]
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/front-end/FileSystemView.js [deleted file]
Source/WebCore/inspector/front-end/ResourcesPanel.js
Source/WebCore/inspector/front-end/Settings.js
Source/WebCore/inspector/front-end/WebKit.qrc
Source/WebCore/inspector/front-end/inspector.html

index 064bf16..04ad20c 100644 (file)
@@ -1030,7 +1030,6 @@ SET(WebCore_SOURCES
     inspector/InspectorDatabaseAgent.cpp
     inspector/InspectorDatabaseResource.cpp
     inspector/InspectorDebuggerAgent.cpp
-    inspector/InspectorFileSystemAgent.cpp
     inspector/InspectorFrontendClientLocal.cpp
     inspector/InspectorFrontendHost.cpp
     inspector/InspectorInstrumentation.cpp
index c3b078a..309e5f6 100644 (file)
@@ -1,3 +1,41 @@
+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:
+
 2011-02-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r78219.
index 36f72ab..dcc44a4 100644 (file)
@@ -1987,8 +1987,6 @@ webcore_sources += \
        Source/WebCore/inspector/InspectorDOMStorageAgent.h \
        Source/WebCore/inspector/InspectorDOMStorageResource.cpp \
        Source/WebCore/inspector/InspectorDOMStorageResource.h \
-       Source/WebCore/inspector/InspectorFileSystemAgent.cpp \
-       Source/WebCore/inspector/InspectorFileSystemAgent.h \
        Source/WebCore/inspector/InspectorFrontendClient.h \
        Source/WebCore/inspector/InspectorFrontendClientLocal.cpp \
        Source/WebCore/inspector/InspectorFrontendClientLocal.h \
index ba9e313..ca7b29e 100644 (file)
             'inspector/InspectorDOMStorageAgent.h',
             'inspector/InspectorDOMStorageResource.cpp',
             'inspector/InspectorDOMStorageResource.h',
-            'inspector/InspectorFileSystemAgent.cpp',
-            'inspector/InspectorFileSystemAgent.h',
             'inspector/InspectorFrontendClient.h',
             'inspector/InspectorFrontendHost.cpp',
             'inspector/InspectorFrontendHost.h',
             'inspector/front-end/ExtensionPanel.js',
             'inspector/front-end/ExtensionRegistryStub.js',
             'inspector/front-end/ExtensionServer.js',
-            'inspector/front-end/FileSystemView.js',
             'inspector/front-end/FontView.js',
             'inspector/front-end/GoToLineDialog.js',
             'inspector/front-end/HAREntry.js',
index dcdb7a5..88522ab 100644 (file)
@@ -1060,7 +1060,6 @@ SOURCES += \
     inspector/InspectorDOMAgent.cpp \
     inspector/InspectorDOMStorageAgent.cpp \
     inspector/InspectorDOMStorageResource.cpp \
-    inspector/InspectorFileSystemAgent.cpp \
     inspector/InspectorFrontendClientLocal.cpp \
     inspector/InspectorFrontendHost.cpp \
     inspector/InspectorInstrumentation.cpp \
index 0cc4fd2..6aa2669 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\inspector\InspectorFileSystemAgent.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\inspector\InspectorFileSystemAgent.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\inspector\InspectorFrontendClient.h"
                                >
                        </File>
                                        >
                                </File>
                                <File
-                                       RelativePath="..\inspector\front-end\FileSystemView.js"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\inspector\front-end\FontView.js"
                                        >
                                </File>
index 9f3e246..cac4355 100644 (file)
                37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
                37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; };
                37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; };
-               3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */; };
-               3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */; };
                3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; };
                41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; };
                41002CCE0F66EDEF009E660D /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */; };
                37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; };
                37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; };
                37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = "<group>"; };
-               3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = "<group>"; };
-               3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = "<group>"; };
                3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = "<group>"; };
                41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
                41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; };
                                7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */,
                                41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
                                41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
-                               3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */,
-                               3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */,
                                F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
                                F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
                                F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */,
                                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
                                7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
                                41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
-                               3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */,
                                F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
                                F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
                                7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
                                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
                                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
                                41F061750F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp in Sources */,
-                               3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */,
                                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
                                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
                                7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
index a794aa3..80c24db 100644 (file)
@@ -151,17 +151,6 @@ module core {
     };
 #endif
 
-#if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM
-    interface [Conditional=INSPECTOR] FileSystem {
-        void getFileSystemPathAsync(in unsigned int type, in String origin);
-        void revealFolderInOS(in String path);
-
-        [notify] void didGetFileSystemPath(out String root, out int type, out String origin);
-        [notify] void didGetFileSystemError(out int type, out String origin);
-        [notify] void didGetFileSystemDisabled();
-    };
-#endif
-
     interface [Conditional=INSPECTOR] DOM {
         void getChildNodes(in long nodeId);
         void setAttribute(in long elementId, in String name, in String value, out boolean success);
index c6d9ca0..e4bdf10 100644 (file)
 #include "InspectorApplicationCacheAgent.h"
 #endif
 
-#if ENABLE(FILE_SYSTEM)
-#include "InspectorFileSystemAgent.h"
-#endif
-
 using namespace std;
 
 namespace WebCore {
@@ -403,11 +399,7 @@ void InspectorAgent::createFrontendLifetimeAgents()
 #endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend);
-#endif
-
-#if ENABLE(FILE_SYSTEM)
-    m_fileSystemAgent = InspectorFileSystemAgent::create(this, m_frontend);
+    m_applicationCacheAgent = new InspectorApplicationCacheAgent(m_inspectedPage->mainFrame()->loader()->documentLoader(), m_frontend);
 #endif
 }
 
@@ -439,11 +431,6 @@ void InspectorAgent::releaseFrontendLifetimeAgents()
     m_applicationCacheAgent.clear();
 #endif
 
-#if ENABLE(FILE_SYSTEM)
-    if (m_fileSystemAgent)
-        m_fileSystemAgent->stop();
-        m_fileSystemAgent.clear();
-#endif
     stopTimelineProfiler();
 }
 
@@ -544,7 +531,7 @@ void InspectorAgent::didCommitLoad(DocumentLoader* loader)
 
     if (m_resourceAgent)
         m_resourceAgent->didCommitLoad(loader);
-    
+
     ASSERT(m_inspectedPage);
 
     if (loader->frame() == m_inspectedPage->mainFrame()) {
@@ -554,6 +541,11 @@ void InspectorAgent::didCommitLoad(DocumentLoader* loader)
         m_injectedScriptHost->discardInjectedScripts();
         m_consoleAgent->reset();
 
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
+        if (m_applicationCacheAgent)
+            m_applicationCacheAgent->didCommitLoad(loader);
+#endif
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         if (m_debuggerAgent) {
             KURL url = inspectedURLWithoutFragment();
index d15c1eb..26f7c14 100644 (file)
@@ -94,10 +94,6 @@ class StorageArea;
 class InspectorApplicationCacheAgent;
 #endif
 
-#if ENABLE(FILE_SYSTEM)
-class InspectorFileSystemAgent;
-#endif
-
 #if ENABLE(WEB_SOCKETS)
 class WebSocketHandshakeRequest;
 class WebSocketHandshakeResponse;
@@ -153,9 +149,6 @@ public:
 #if ENABLE(DOM_STORAGE)
     InspectorDOMStorageAgent* domStorageAgent() { return m_domStorageAgent.get(); }
 #endif
-#if ENABLE(FILE_SYSTEM)
-    InspectorFileSystemAgent* fileSystemAgent() { return m_fileSystemAgent.get(); }
-#endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     InspectorBrowserDebuggerAgent* browserDebuggerAgent() const { return m_browserDebuggerAgent.get(); }
     InspectorDebuggerAgent* debuggerAgent() const { return m_debuggerAgent.get(); }
@@ -295,10 +288,6 @@ private:
     OwnPtr<InspectorApplicationCacheAgent> m_applicationCacheAgent;
 #endif
 
-#if ENABLE(FILE_SYSTEM)
-    RefPtr<InspectorFileSystemAgent> m_fileSystemAgent;
-#endif
-
     RefPtr<Node> m_highlightedNode;
     RefPtr<Node> m_nodeToFocus;
     RefPtr<InspectorResourceAgent> m_resourceAgent;
index 2776c56..b38bb83 100644 (file)
 
 namespace WebCore {
 
-InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InspectorAgent* inspectorAgent, InspectorFrontend* frontend)
-    : m_inspectorAgent(inspectorAgent)
+InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(DocumentLoader* documentLoader, InspectorFrontend* frontend)
+    : m_documentLoader(documentLoader)
     , m_frontend(frontend)
 {
 }
 
+void InspectorApplicationCacheAgent::didCommitLoad(DocumentLoader* documentLoader)
+{
+    m_documentLoader = documentLoader;
+}
+
 void InspectorApplicationCacheAgent::updateApplicationCacheStatus(Frame* frame)
 {
     ApplicationCacheHost::Status status = frame->loader()->documentLoader()->applicationCacheHost()->status();
@@ -61,9 +66,8 @@ void InspectorApplicationCacheAgent::networkStateChanged()
 
 void InspectorApplicationCacheAgent::getApplicationCaches(RefPtr<InspectorValue>* applicationCaches)
 {
-    DocumentLoader* documentLoader = m_inspectorAgent->inspectedPage()->mainFrame()->loader()->documentLoader();
-    if (documentLoader) {
-        ApplicationCacheHost* host = documentLoader->applicationCacheHost();
+    if (m_documentLoader) {
+        ApplicationCacheHost* host = m_documentLoader->applicationCacheHost();
         ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
 
         ApplicationCacheHost::ResourceInfoList resources;
index b9352fe..33cee59 100644 (file)
@@ -33,6 +33,7 @@
 
 namespace WebCore {
 
+class DocumentLoader;
 class Frame;
 class InspectorArray;
 class InspectorAgent;
@@ -44,9 +45,11 @@ class ResourceResponse;
 class InspectorApplicationCacheAgent {
     WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
 public:
-    InspectorApplicationCacheAgent(InspectorAgent*, InspectorFrontend*);
+    InspectorApplicationCacheAgent(DocumentLoader*, InspectorFrontend*);
     ~InspectorApplicationCacheAgent() { }
 
+    void didCommitLoad(DocumentLoader*);
+
     // Backend to Frontend
     void updateApplicationCacheStatus(Frame*);
     void networkStateChanged();
@@ -59,7 +62,7 @@ private:
     PassRefPtr<InspectorArray> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
     PassRefPtr<InspectorObject> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
 
-    InspectorAgent* m_inspectorAgent;
+    DocumentLoader* m_documentLoader;
     InspectorFrontend* m_frontend;
 };
 
diff --git a/Source/WebCore/inspector/InspectorFileSystemAgent.cpp b/Source/WebCore/inspector/InspectorFileSystemAgent.cpp
deleted file mode 100644 (file)
index 467c97a..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InspectorFileSystemAgent.h"
-
-#if ENABLE(INSPECTOR) && ENABLE(FILE_SYSTEM)
-
-#include "AsyncFileWriter.h"
-#include "Document.h"
-#include "FileSystem.h"
-#include "FileSystemCallbacks.h"
-#include "Frame.h"
-#include "FrameTree.h"
-#include "InspectorAgent.h"
-#include "InspectorFrontend.h"
-#include "LocalFileSystem.h"
-#include "NotImplemented.h"
-#include "Page.h"
-#include "RuntimeEnabledFeatures.h"
-
-namespace WebCore {
-
-class InspectorFileSystemAgentCallbacks : public AsyncFileSystemCallbacks {
-public:
-    InspectorFileSystemAgentCallbacks(InspectorFileSystemAgent* agent, AsyncFileSystem::Type type, const String& origin)
-        : m_agent(agent)
-        , m_type(type)
-        , m_origin(origin)
-    { 
-    }
-
-    ~InspectorFileSystemAgentCallbacks()
-    {
-    }
-
-    // FileSystemCallbacks is only used for getting filesystem. All other methods are irrelevant and will not be called.
-    void didSucceed()
-    {
-        ASSERT_NOT_REACHED();
-    }
-
-    void didOpenFileSystem(const String&, PassOwnPtr<AsyncFileSystem> fileSystem)
-    {
-        // Agent will be alive even if InspectorAgent is destroyed until callback is run.
-        m_agent->didGetFileSystemPath(fileSystem->root(), m_type, m_origin);
-    }
-
-    void didReadMetadata(const FileMetadata&)
-    {
-        ASSERT_NOT_REACHED();
-    }
-
-    void didReadDirectoryEntry(const String&, bool)
-    {
-        ASSERT_NOT_REACHED();
-    }
-
-    void didReadDirectoryEntries(bool)
-    {
-        ASSERT_NOT_REACHED();
-    }
-
-    void didCreateFileWriter(PassOwnPtr<AsyncFileWriter>, long long)
-    {
-        ASSERT_NOT_REACHED();
-    }
-    
-    void didFail(int)
-    {
-        // FIXME: Is it useful to give back the code to Inspector UI?
-        m_agent->didGetFileSystemError(m_type, m_origin);
-    }
-
-private:
-    RefPtr<InspectorFileSystemAgent> m_agent;
-    AsyncFileSystem::Type m_type;
-    String m_origin;
-};
-
-InspectorFileSystemAgent::InspectorFileSystemAgent(InspectorAgent* inspectorAgent, InspectorFrontend* frontend)
-    : m_inspectorAgent(inspectorAgent)
-    , m_frontend(frontend)
-{
-}
-
-InspectorFileSystemAgent::~InspectorFileSystemAgent() { }
-
-void InspectorFileSystemAgent::stop()
-{
-    m_inspectorAgent = 0;
-}
-
-#if PLATFORM(CHROMIUM)
-void InspectorFileSystemAgent::revealFolderInOS(const String& path)
-{
-    // FIXME: Remove guard when revealFolderInOS is implemented for non-chromium platforms.
-    WebCore::revealFolderInOS(path);
-}
-#else
-void InspectorFileSystemAgent::revealFolderInOS(const String&)
-{
-    notImplemented();
-}
-#endif
-
-void InspectorFileSystemAgent::getFileSystemPathAsync(unsigned int type, const String& origin)
-{
-    if (!RuntimeEnabledFeatures::fileSystemEnabled()) {
-        m_frontend->didGetFileSystemDisabled();
-        return;
-    }
-
-    AsyncFileSystem::Type asyncFileSystemType = static_cast<AsyncFileSystem::Type>(type);
-    Frame* mainFrame = m_inspectorAgent->inspectedPage()->mainFrame();
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
-        Document* document = frame->document();
-        if (document && document->securityOrigin()->toString() == origin) {
-            LocalFileSystem::localFileSystem().readFileSystem(document, asyncFileSystemType, 0, new InspectorFileSystemAgentCallbacks(this, asyncFileSystemType, origin));
-            return;
-        }
-    }
-}
-
-void InspectorFileSystemAgent::didGetFileSystemPath(const String& root, AsyncFileSystem::Type type, const String& origin)
-{
-    // When controller is being destroyed, this is set to 0. Agent can live even after m_inspectorAgent is destroyed.
-    if (!m_inspectorAgent)
-        return;
-
-    m_frontend->didGetFileSystemPath(root, static_cast<unsigned int>(type), origin);
-}
-
-void InspectorFileSystemAgent::didGetFileSystemError(AsyncFileSystem::Type type, const String& origin)
-{
-    // When controller is being destroyed, this is set to 0. Agent can live even after m_inspectorAgent is destroyed.
-    if (!m_inspectorAgent)
-        return;
-    m_frontend->didGetFileSystemError(static_cast<unsigned int>(type), origin);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR) && ENABLE(FILE_SYSTEM)
diff --git a/Source/WebCore/inspector/InspectorFileSystemAgent.h b/Source/WebCore/inspector/InspectorFileSystemAgent.h
deleted file mode 100644 (file)
index b995d70..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorFileSystemAgent_h
-#define InspectorFileSystemAgent_h
-
-#if ENABLE(INSPECTOR) && ENABLE(FILE_SYSTEM)
-
-#include "AsyncFileSystem.h"
-#include "AsyncFileSystemCallbacks.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-class Document;
-class InspectorAgent;
-class InspectorFrontend;
-class LocalFileSystem;
-
-class InspectorFileSystemAgent : public RefCounted<InspectorFileSystemAgent> {
-public:
-    static PassRefPtr<InspectorFileSystemAgent> create(InspectorAgent* inspectorAgent, InspectorFrontend* frontend)
-    {
-        return adoptRef(new InspectorFileSystemAgent(inspectorAgent, frontend));
-    }
-
-    ~InspectorFileSystemAgent();
-    void stop();
-
-    // From Frontend
-    void getFileSystemPathAsync(unsigned int type, const String& origin);
-    void revealFolderInOS(const String& path);
-
-    // Backend to Frontend
-    void didGetFileSystemPath(const String&, AsyncFileSystem::Type, const String& origin);
-    void didGetFileSystemError(AsyncFileSystem::Type, const String& origin);
-    void didGetFileSystemDisabled();
-
-private:
-    InspectorFileSystemAgent(InspectorAgent*, InspectorFrontend*);
-    void getFileSystemRoot(AsyncFileSystem::Type);
-
-    InspectorAgent* m_inspectorAgent;
-    InspectorFrontend* m_frontend;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR) && ENABLE(FILE_SYSTEM)
-#endif // InspectorFileSystemAgent_h
index 074505e..399926f 100644 (file)
@@ -372,12 +372,12 @@ void InspectorInstrumentation::didRecalculateStyleImpl(const InspectorInstrument
         timelineAgent->didRecalculateStyle();
 }
 
-void InspectorInstrumentation::identifierForInitialRequestImpl(InspectorAgent* ic, unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
+void InspectorInstrumentation::identifierForInitialRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
 {
-    if (!ic->enabled())
+    if (!inspectorAgent->enabled())
         return;
 
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
 }
 
@@ -386,25 +386,25 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InspectorAgent* inspec
     inspectorAgent->applyUserAgentOverride(userAgent);
 }
 
-void InspectorInstrumentation::willSendRequestImpl(InspectorAgent* ic, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
+void InspectorInstrumentation::willSendRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
-    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
+    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
         timelineAgent->willSendResourceRequest(identifier, request);
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->willSendRequest(identifier, request, redirectResponse);
 }
 
-void InspectorInstrumentation::markResourceAsCachedImpl(InspectorAgent* ic, unsigned long identifier)
+void InspectorInstrumentation::markResourceAsCachedImpl(InspectorAgent* inspectorAgent, unsigned long identifier)
 {
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->markResourceAsCached(identifier);
 }
 
-void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InspectorAgent* ic, DocumentLoader* loader, const CachedResource* cachedResource)
+void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InspectorAgent* inspectorAgent, DocumentLoader* loader, const CachedResource* cachedResource)
 {
-    if (!ic->enabled())
+    if (!inspectorAgent->enabled())
         return;
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
 }
 
@@ -438,47 +438,47 @@ InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResp
 
 void InspectorInstrumentation::didReceiveResourceResponseImpl(const InspectorInstrumentationCookie& cookie, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response)
 {
-    InspectorAgent* ic = cookie.first;
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    InspectorAgent* inspectorAgent = cookie.first;
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->didReceiveResponse(identifier, loader, response);
-    ic->consoleAgent()->didReceiveResponse(identifier, response);
+    inspectorAgent->consoleAgent()->didReceiveResponse(identifier, response);
     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
         timelineAgent->didReceiveResourceResponse();
 }
 
-void InspectorInstrumentation::didReceiveContentLengthImpl(InspectorAgent* ic, unsigned long identifier, int lengthReceived)
+void InspectorInstrumentation::didReceiveContentLengthImpl(InspectorAgent* inspectorAgent, unsigned long identifier, int lengthReceived)
 {
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->didReceiveContentLength(identifier, lengthReceived);
 }
 
-void InspectorInstrumentation::didFinishLoadingImpl(InspectorAgent* ic, unsigned long identifier, double finishTime)
+void InspectorInstrumentation::didFinishLoadingImpl(InspectorAgent* inspectorAgent, unsigned long identifier, double finishTime)
 {
-    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
+    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
         timelineAgent->didFinishLoadingResource(identifier, false, finishTime);
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->didFinishLoading(identifier, finishTime);
 }
 
-void InspectorInstrumentation::didFailLoadingImpl(InspectorAgent* ic, unsigned long identifier, const ResourceError& error)
+void InspectorInstrumentation::didFailLoadingImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const ResourceError& error)
 {
-    ic->consoleAgent()->didFailLoading(identifier, error);
-    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(ic))
+    inspectorAgent->consoleAgent()->didFailLoading(identifier, error);
+    if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(inspectorAgent))
         timelineAgent->didFinishLoadingResource(identifier, true, 0);
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->didFailLoading(identifier, error);
 }
 
-void InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl(InspectorAgent* ic, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
+void InspectorInstrumentation::resourceRetrievedByXMLHttpRequestImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber)
 {
-    ic->consoleAgent()->resourceRetrievedByXMLHttpRequest(url, sendURL, sendLineNumber);
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    inspectorAgent->consoleAgent()->resourceRetrievedByXMLHttpRequest(url, sendURL, sendLineNumber);
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->setInitialContent(identifier, sourceString, "XHR");
 }
 
-void InspectorInstrumentation::scriptImportedImpl(InspectorAgent* ic, unsigned long identifier, const String& sourceString)
+void InspectorInstrumentation::scriptImportedImpl(InspectorAgent* inspectorAgent, unsigned long identifier, const String& sourceString)
 {
-    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
+    if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(inspectorAgent))
         resourceAgent->setInitialContent(identifier, sourceString, "Script");
 }
 
@@ -631,15 +631,15 @@ void InspectorInstrumentation::didCloseWebSocketImpl(InspectorAgent* inspectorAg
 #endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-void InspectorInstrumentation::networkStateChangedImpl(InspectorAgent* ic)
+void InspectorInstrumentation::networkStateChangedImpl(InspectorAgent* inspectorAgent)
 {
-    if (InspectorApplicationCacheAgent* applicationCacheAgent = ic->applicationCacheAgent())
+    if (InspectorApplicationCacheAgent* applicationCacheAgent = inspectorAgent->applicationCacheAgent())
         applicationCacheAgent->networkStateChanged();
 }
 
-void InspectorInstrumentation::updateApplicationCacheStatusImpl(InspectorAgent* ic, Frame* frame)
+void InspectorInstrumentation::updateApplicationCacheStatusImpl(InspectorAgent* inspectorAgent, Frame* frame)
 {
-    if (InspectorApplicationCacheAgent* applicationCacheAgent = ic->applicationCacheAgent())
+    if (InspectorApplicationCacheAgent* applicationCacheAgent = inspectorAgent->applicationCacheAgent())
         applicationCacheAgent->updateApplicationCacheStatus(frame);
 }
 #endif
@@ -678,9 +678,9 @@ InspectorTimelineAgent* InspectorInstrumentation::retrieveTimelineAgent(const In
     return 0;
 }
 
-InspectorResourceAgent* InspectorInstrumentation::retrieveResourceAgent(InspectorAgent* ic)
+InspectorResourceAgent* InspectorInstrumentation::retrieveResourceAgent(InspectorAgent* inspectorAgent)
 {
-    return ic->resourceAgent();
+    return inspectorAgent->resourceAgent();
 }
 
 } // namespace WebCore
diff --git a/Source/WebCore/inspector/front-end/FileSystemView.js b/Source/WebCore/inspector/front-end/FileSystemView.js
deleted file mode 100644 (file)
index 56f21a4..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.FileSystemDispatcher = function()
-{
-}
-
-// Keep in sync with Type in AsyncFileSystem.h
-WebInspector.FileSystemDispatcher.TEMPORARY = 0;
-WebInspector.FileSystemDispatcher.PERSISTENT = 1;
-
-WebInspector.FileSystemDispatcher.prototype = {
-    getFileSystemPathsAsync: function(origin)
-    {
-        InspectorBackend.getFileSystemPathAsync(WebInspector.FileSystemDispatcher.PERSISTENT, origin);
-        InspectorBackend.getFileSystemPathAsync(WebInspector.FileSystemDispatcher.TEMPORARY, origin);
-    },
-
-    didGetFileSystemPath: function(root, type, origin)
-    {
-        WebInspector.panels.resources.updateFileSystemPath(root, type, origin);
-    },
-
-    didGetFileSystemError: function(type, origin)
-    {
-        WebInspector.panels.resources.updateFileSystemError(type, origin);
-    },
-
-    didGetFileSystemDisabled: function()
-    {
-        WebInspector.panels.resources.setFileSystemDisabled();
-    }
-}
-
-InspectorBackend.registerDomainDispatcher("FileSystem", new WebInspector.FileSystemDispatcher());
-
-WebInspector.FileSystemView = function(treeElement, fileSystemOrigin)
-{
-    WebInspector.View.call(this);
-
-    this.element.addStyleClass("resource-view");
-    this._treeElement = treeElement;
-    this._origin = fileSystemOrigin;
-    this._tabbedPane = new WebInspector.TabbedPane(this.element);
-
-    this._persistentFileSystemElement = document.createElement("div");
-    this._persistentFileSystemElement.className = "resource-view-headers";
-    this._tabbedPane.appendTab("persistent", WebInspector.UIString("Persistent File System"), this._persistentFileSystemElement, this._selectFileSystemTab.bind(this, true));
-
-    this._tempFileSystemElement = document.createElement("div");
-    this._tempFileSystemElement.className = "resource-view-headers";
-    this._tabbedPane.appendTab("temp", WebInspector.UIString("Temporary File System"), this._tempFileSystemElement, this.selectTemporaryFileSystemTab.bind(this, true));
-
-    this._temporaryRoot = "";
-    this._persistentRoot = "";
-    this._isFileSystemDisabled = false;
-    this._persistentRootError = false;
-    this._temporaryRootError = false;
-    this.fileSystemVisible = true;
-    this._selectFileSystemTab();
-    this.refreshFileSystem();
-}
-
-WebInspector.FileSystemView.prototype = {
-    show: function(parentElement)
-    {
-        WebInspector.View.prototype.show.call(this, parentElement);
-        this._update();
-    },
-
-    set fileSystemVisible(x)
-    {
-        if (x === this._fileSystemVisible)
-            return;
-        this._fileSystemVisible = x;
-        if (x)
-            this.element.addStyleClass("headers-visible");
-        else
-            this.element.removeStyleClass("headers-visible"); 
-        this._selectFileSystemTab();
-    },
-
-    _update: function()
-    {
-        this._selectFileSystemTab();
-        WebInspector.FileSystem.getFileSystemPathsAsync(this._origin);
-    },
-
-    updateFileSystemPath: function(root, type, origin)
-    {
-        if (origin == this._origin && type == WebInspector.FileSystem.PERSISTENT) {
-            this._persistentRoot = root;
-            this._persistentRootError = false;
-        }
-        
-        if (origin == this._origin && type == WebInspector.FileSystem.TEMPORARY) {
-            this._temporaryRoot = root;
-            this._temporaryRootErrorError = false;
-        }
-
-        this.refreshFileSystem();
-    },
-    
-    updateFileSystemError: function(type, origin)
-    {
-        if (type == WebInspector.FileSystem.PERSISTENT)
-            this._persistentRootError = true;
-        
-        if (type == WebInspector.FileSystem.TEMPORARY)
-            this._temporaryRootError = true;
-
-        this.refreshFileSystem();
-    },
-    
-    setFileSystemDisabled: function()
-    {
-        this._isFileSystemDisabled = true;
-        this.refreshFileSystem();
-    },
-    _selectFileSystemTab: function()
-    {
-        this._tabbedPane.selectTab("persistent");
-    },
-    
-    selectTemporaryFileSystemTab: function()
-    {
-        this._tabbedPane.selectTab("temp");
-    },
-
-    _revealPersistentFolderInOS: function()
-    {
-        InspectorBackend.revealFolderInOS(this._persistentRoot);
-    },
-    
-    _revealTemporaryFolderInOS: function()
-    {
-        InspectorBackend.revealFolderInOS(this._temporaryRoot);
-    },
-    
-    _createTextAndButton: function(fileSystemElement, rootPathText, type, isError)
-    {
-        fileSystemElement.removeChildren();
-        var rootPath = WebInspector.UIString("File System root path not available.");
-        if (this._isFileSystemDisabled)
-            rootPath = WebInspector.UIString("File System is disabled.");
-        else if (isError)
-            rootPath = WebInspector.UIString("Error in fetching root path for file system.");
-        else if (rootPathText)
-            rootPath = rootPathText;
-
-        var rootTextNode = document.createTextNode("Root: " + rootPath.escapeHTML());
-        var rootSystemElement = document.createElement("div");
-        rootSystemElement.className = "header-value source-code";
-        rootSystemElement.appendChild(rootTextNode);
-        fileSystemElement.appendChild(rootSystemElement);
-            
-        if (!isError && rootPathText) {
-            // Append Browse button iff root path is available and it is not an error.
-            var contentElement = document.createElement("div");
-            contentElement.className = "panel-enabler-view-content";
-            fileSystemElement.appendChild(contentElement);
-            var choicesForm = document.createElement("form");
-            contentElement.appendChild(choicesForm);
-            var enableButton = document.createElement("button");
-            enableButton.setAttribute("type", "button");
-            enableButton.textContent = WebInspector.UIString("Reveal folder in OS");
-            // FIXME: Bind this directly to InspectorBackend.
-            if (type == WebInspector.FileSystem.PERSISTENT)
-                enableButton.addEventListener("click", this._revealPersistentFolderInOS.bind(this), false);
-            if (type == WebInspector.FileSystem.TEMPORARY)
-                enableButton.addEventListener("click", this._revealTemporaryFolderInOS.bind(this), false);
-            choicesForm.appendChild(enableButton);
-            fileSystemElement.appendChild(contentElement);
-        }
-    },
-    
-    refreshFileSystem: function()
-    {
-        this._createTextAndButton(this._persistentFileSystemElement, this._persistentRoot, WebInspector.FileSystem.PERSISTENT, this._persistentRootError);
-        this._createTextAndButton(this._tempFileSystemElement, this._temporaryRoot, WebInspector.FileSystem.TEMPORARY, this._temporaryRootError);
-    }, 
-}
-
-WebInspector.FileSystemView.prototype.__proto__ = WebInspector.View.prototype;
index c7077a9..7c0649f 100644 (file)
@@ -56,12 +56,6 @@ WebInspector.ResourcesPanel = function(database)
     this.applicationCacheListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Application Cache"), "ApplicationCache", "application-cache-storage-tree-item");
     this.sidebarTree.appendChild(this.applicationCacheListTreeElement);
 
-    if (Preferences.fileSystemEnabled) {
-        this.fileSystemListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("File System"), "FileSystem", "file-system-storage-tree-item");
-        this.sidebarTree.appendChild(this.fileSystemListTreeElement);
-        this.fileSystemListTreeElement.expand();
-    }
-
     this.storageViews = document.createElement("div");
     this.storageViews.id = "storage-views";
     this.storageViews.className = "diff-container";
@@ -154,7 +148,6 @@ WebInspector.ResourcesPanel.prototype = {
         this._domStorage = [];
 
         this._cookieViews = {};
-        this._fileSystemView = null;
         
         this._applicationCacheView = null;
         delete this._cachedApplicationCacheViewStatus;
@@ -164,8 +157,6 @@ WebInspector.ResourcesPanel.prototype = {
         this.sessionStorageListTreeElement.removeChildren();
         this.cookieListTreeElement.removeChildren();
         this.applicationCacheListTreeElement.removeChildren();
-        if (Preferences.fileSystemEnabled)
-            this.fileSystemListTreeElement.removeChildren();
         this.storageViews.removeChildren();
 
         this.storageViewStatusBarItemsContainer.removeChildren();
@@ -299,16 +290,6 @@ WebInspector.ResourcesPanel.prototype = {
             var applicationCacheTreeElement = new WebInspector.ApplicationCacheTreeElement(this, domain);
             this.applicationCacheListTreeElement.appendChild(applicationCacheTreeElement);
         }
-
-        if (Preferences.fileSystemEnabled) {
-            // FIXME: This should match the SecurityOrigin::toString(), add a test for this.
-            var securityOrigin = parsedURL.scheme + "://" + parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "");
-            if (!this._origins[securityOrigin]) {
-                this._origins[securityOrigin] = true;
-                var fileSystemTreeElement = new WebInspector.FileSystemTreeElement(this, securityOrigin);
-                this.fileSystemListTreeElement.appendChild(fileSystemTreeElement);
-            }
-        }
     },
 
     addDOMStorage: function(domStorage)
@@ -489,12 +470,6 @@ WebInspector.ResourcesPanel.prototype = {
             this._applicationCacheView.updateStatus(this._cachedApplicationCacheViewStatus);
     },
 
-    showFileSystem: function(treeElement, origin)
-    {
-        this._fileSystemView = new WebInspector.FileSystemView(treeElement, origin);
-        this._innerShowView(this._fileSystemView);
-    },
-    
     showCategoryView: function(categoryName)
     {
         if (!this._categoryView)
@@ -643,24 +618,6 @@ WebInspector.ResourcesPanel.prototype = {
             this._applicationCacheView.updateStatus(status);
     },
 
-    updateFileSystemPath: function(root, type, origin)
-    {
-        if (this._fileSystemView && this._fileSystemView === this.visibleView)
-            this._fileSystemView.updateFileSystemPath(root, type, origin);  
-    },
-  
-    updateFileSystemError: function(type, origin)
-    {
-        if (this._fileSystemView && this._fileSystemView === this.visibleView)
-            this._fileSystemView.updateFileSystemError(type, origin);  
-    },
-    
-    setFileSystemDisabled: function()
-    {
-        if (this._fileSystemView && this._fileSystemView === this.visibleView)
-            this._fileSystemView.setFileSystemDisabled();  
-    },
-
     updateNetworkState: function(isNowOnline)
     {
         if (this._applicationCacheView && this._applicationCacheView === this.visibleView)
@@ -1283,27 +1240,6 @@ WebInspector.ResourceRevisionTreeElement.prototype = {
 
 WebInspector.ResourceRevisionTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
 
-WebInspector.FileSystemTreeElement = function(storagePanel, origin)
-{
-    WebInspector.BaseStorageTreeElement.call(this, storagePanel, null, origin, "file-system-storage-tree-item");
-    this._origin = origin;
-}
-
-WebInspector.FileSystemTreeElement.prototype = {
-    get itemURL()
-    {
-        return "file-system://" + encodeURI(this._origin);
-    },
-
-    onselect: function()
-    {
-        WebInspector.BaseStorageTreeElement.prototype.onselect.call(this);
-        this._storagePanel.showFileSystem(this, this._origin);
-    }
-}
-WebInspector.FileSystemTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
 WebInspector.StorageCategoryView = function()
 {
     WebInspector.View.call(this);
index 83ebaf0..68b81a5 100644 (file)
@@ -45,7 +45,6 @@ var Preferences = {
     onlineDetectionEnabled: true,
     nativeInstrumentationEnabled: false,
     resourceExportEnabled: false,
-    fileSystemEnabled: false,
     useDataURLForResourceImageIcons: true,
     showTimingTab: false,
     showCookiesTab: false,
index ca6ba29..dd325ba 100644 (file)
@@ -44,7 +44,6 @@
     <file>ExtensionPanel.js</file>
     <file>ExtensionRegistryStub.js</file>
     <file>ExtensionServer.js</file>
-    <file>FileSystemView.js</file>
     <file>FontView.js</file>
     <file>GoToLineDialog.js</file>
     <file>HAREntry.js</file>
index 4d8e953..0435dc3 100644 (file)
@@ -72,7 +72,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <script type="text/javascript" src="CookiesTable.js"></script>
     <script type="text/javascript" src="CookieItemsView.js"></script>
     <script type="text/javascript" src="ApplicationCacheItemsView.js"></script>
-    <script type="text/javascript" src="FileSystemView.js"></script>
     <script type="text/javascript" src="Script.js"></script>
     <script type="text/javascript" src="Breakpoint.js"></script>
     <script type="text/javascript" src="BreakpointManager.js"></script>