Changeset 120475 in webkit

Timestamp:

Jun 15, 2012, 10:16:30 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Move FileSystem frame management from frontend to backend
​https://bugs.webkit.org/show_bug.cgi?id=89190

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-06-15
Reviewed by Vsevolod Vlasov.

Source/WebCore:

Test: http/tests/inspector/filesystem/read-directory.html

• inspector/Inspector.json:
• inspector/InspectorFileSystemAgent.cpp:

(WebCore::InspectorFileSystemAgent::readDirectory):
(WebCore::InspectorFileSystemAgent::InspectorFileSystemAgent):
(WebCore::InspectorFileSystemAgent::scriptExecutionContextForOrigin):
(WebCore):

• inspector/InspectorFileSystemAgent.h:

(WebCore):
(InspectorFileSystemAgent):

LayoutTests:

• http/tests/inspector/filesystem/read-directory.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/filesystem/read-directory.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (1 diff)
• Source/WebCore/inspector/InspectorFileSystemAgent.cpp (modified) (4 diffs)
• Source/WebCore/inspector/InspectorFileSystemAgent.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: Move FileSystem frame management from frontend to backend
+        https://bugs.webkit.org/show_bug.cgi?id=89190
+
+        Reviewed by Vsevolod Vlasov.
+
+        * http/tests/inspector/filesystem/read-directory.html:
+
 2012-06-15  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/filesystem/read-directory.html

@@ -38 +38 @@
         InspectorTest.addSniffer(FileSystemDispatcher.prototype, "didReadDirectory", step5, false);
         // FIXME: Call FileSystemDispatcher through FileSystemDispatcher implementation after it landed.
-        FileSystemAgent.readDirectory(1, WebInspector.resourceTreeModel.mainFrame.id, "filesystem:http://127.0.0.1/temporary/hoge");
+        FileSystemAgent.readDirectory(1, "filesystem:http://127.0.0.1:8000/temporary/hoge");
     }
 
@@ -47 +47 @@
         InspectorTest.addSniffer(FileSystemDispatcher.prototype, "didReadDirectory", step6, false);
         // FIXME: Call FileSystemDispatcher through FileSystemDispatcher implementation after it landed.
-        FileSystemAgent.readDirectory(1, WebInspector.resourceTreeModel.mainFrame.id, "filesystem:http://127.0.0.1/temporary/foo");
+        FileSystemAgent.readDirectory(1, "filesystem:http://127.0.0.1:8000/temporary/foo");
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-15  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: Move FileSystem frame management from frontend to backend
+        https://bugs.webkit.org/show_bug.cgi?id=89190
+
+        Reviewed by Vsevolod Vlasov.
+
+        Test: http/tests/inspector/filesystem/read-directory.html
+
+        * inspector/Inspector.json:
+        * inspector/InspectorFileSystemAgent.cpp:
+        (WebCore::InspectorFileSystemAgent::readDirectory):
+        (WebCore::InspectorFileSystemAgent::InspectorFileSystemAgent):
+        (WebCore::InspectorFileSystemAgent::scriptExecutionContextForOrigin):
+        (WebCore):
+        * inspector/InspectorFileSystemAgent.h:
+        (WebCore):
+        (InspectorFileSystemAgent):
+
 2012-06-15  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -1431 +1431 @@
                 "parameters": [
                     { "name": "requestId", "type": "integer" },
-                    { "name": "frameId", "type": "string" },
                     { "name": "url", "type": "string" }
                 ]

trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp

@@ -53 +53 @@
 #include "LocalFileSystem.h"
 #include "MIMETypeRegistry.h"
+#include "SecurityOrigin.h"
 
 using WebCore::TypeBuilder::Array;
@@ -309 +310 @@
 }
 
-void InspectorFileSystemAgent::readDirectory(ErrorString*, int requestId, const String& frameId, const String& url)
+void InspectorFileSystemAgent::readDirectory(ErrorString*, int requestId, const String& url)
 {
     if (!m_enabled || !m_frontendProvider)
@@ -315 +316 @@
     ASSERT(m_frontendProvider->frontend());
 
-    Frame* frame = m_pageAgent->frameForId(frameId);
-    if (!frame) {
+    if (ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextForOrigin(SecurityOrigin::createFromString(url).get()))
+        ReadDirectoryTask::create(m_frontendProvider, requestId, url)->start(scriptExecutionContext);
+    else
         m_frontendProvider->frontend()->didReadDirectory(requestId, static_cast<int>(FileError::ABORT_ERR), 0);
-        return;
-    }
-
-    ReadDirectoryTask::create(m_frontendProvider, requestId, url)->start(frame->document());
 }
 
@@ -352 +350 @@
     ASSERT(instrumentingAgents);
     ASSERT(state);
+    ASSERT(m_pageAgent);
     m_instrumentingAgents->setInspectorFileSystemAgent(this);
 }
 
+ScriptExecutionContext* InspectorFileSystemAgent::scriptExecutionContextForOrigin(SecurityOrigin* origin)
+{
+    for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        if (frame->document() && frame->document()->securityOrigin()->isSameSchemeHostPort(origin))
+            return frame->document();
+    }
+    return 0;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorFileSystemAgent.h

@@ -47 +47 @@
 class InspectorState;
 class InstrumentingAgents;
+class ScriptExecutionContext;
+class SecurityOrigin;
 
 class InspectorFileSystemAgent : public InspectorBaseAgent<InspectorFileSystemAgent>, public InspectorBackendDispatcher::FileSystemCommandHandler {
@@ -58 +60 @@
     virtual void disable(ErrorString*) OVERRIDE;
 
-    virtual void readDirectory(ErrorString*, int requestId, const String& frameId, const String& url) OVERRIDE;
+    virtual void readDirectory(ErrorString*, int requestId, const String& url) OVERRIDE;
 
     virtual void setFrontend(InspectorFrontend*) OVERRIDE;
     virtual void clearFrontend() OVERRIDE;
     virtual void restore() OVERRIDE;
+
 private:
     InspectorFileSystemAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorState*);
+    ScriptExecutionContext* scriptExecutionContextForOrigin(SecurityOrigin*);
 
     InspectorPageAgent* m_pageAgent;