[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:29:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 51643343417eb6dc97bb1c24d7f126ec221f4244
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 23:34:17 2010 +0000
2010-11-04 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Adam Barth.
Web Inspector: Enable files ystem UI for chromium
https://bugs.webkit.org/show_bug.cgi?id=48963
* inspector/Inspector.idl:
* inspector/InspectorFileSystemAgent.cpp:
(WebCore::InspectorFileSystemAgent::getFileSystemPathAsync):
* inspector/InspectorFileSystemAgent.h:
* inspector/front-end/FileSystemView.js:
(WebInspector.FileSystemView):
(WebInspector.FileSystemView.prototype.setFileSystemDisabled):
(WebInspector.FileSystemView.prototype._createTextAndButton):
(WebInspector.FileSystemView.prototype.refreshFileSystem):
* inspector/front-end/StoragePanel.js:
(WebInspector.StoragePanel.prototype.setFileSystemDisabled):
* inspector/front-end/inspector.js:
(WebInspector.didGetFileSystemDisabled):
(WebInspector.reset):
2010-11-04 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Adam Barth.
Web Inspector: Enable files ystem UI for chromium
https://bugs.webkit.org/show_bug.cgi?id=48963
* src/js/DevTools.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71366 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 10f82fe..208d9ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-11-04 Kavita Kanetkar <kkanetkar at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Web Inspector: Enable files ystem UI for chromium
+ https://bugs.webkit.org/show_bug.cgi?id=48963
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorFileSystemAgent.cpp:
+ (WebCore::InspectorFileSystemAgent::getFileSystemPathAsync):
+ * inspector/InspectorFileSystemAgent.h:
+ * inspector/front-end/FileSystemView.js:
+ (WebInspector.FileSystemView):
+ (WebInspector.FileSystemView.prototype.setFileSystemDisabled):
+ (WebInspector.FileSystemView.prototype._createTextAndButton):
+ (WebInspector.FileSystemView.prototype.refreshFileSystem):
+ * inspector/front-end/StoragePanel.js:
+ (WebInspector.StoragePanel.prototype.setFileSystemDisabled):
+ * inspector/front-end/inspector.js:
+ (WebInspector.didGetFileSystemDisabled):
+ (WebInspector.reset):
+
2010-11-04 Robert Hogan <robert at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index cf39906..02e2143 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 11d9a01..58a49b6 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -221,6 +221,7 @@ module core {
[handler=FileSystem] 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
[handler=Backend] void releaseWrapperObjectGroup(in long injectedScriptId, in String objectGroup);
diff --git a/WebCore/inspector/InspectorFileSystemAgent.cpp b/WebCore/inspector/InspectorFileSystemAgent.cpp
index 1ac7fa5..2192fd1 100644
--- a/WebCore/inspector/InspectorFileSystemAgent.cpp
+++ b/WebCore/inspector/InspectorFileSystemAgent.cpp
@@ -43,6 +43,7 @@
#include "InspectorFrontend.h"
#include "LocalFileSystem.h"
#include "Page.h"
+#include "RuntimeEnabledFeatures.h"
namespace WebCore {
@@ -123,12 +124,17 @@ void InspectorFileSystemAgent::revealFolderInOS(const String& path)
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_inspectorController->inspectedPage()->mainFrame();
for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
Document* document = frame->document();
if (document && document->securityOrigin()->toString() == origin) {
- LocalFileSystem::localFileSystem().requestFileSystem(document, asyncFileSystemType, 0, new InspectorFileSystemAgentCallbacks(this, asyncFileSystemType, origin));
+ LocalFileSystem::localFileSystem().readFileSystem(document, asyncFileSystemType, 0, new InspectorFileSystemAgentCallbacks(this, asyncFileSystemType, origin));
return;
}
}
diff --git a/WebCore/inspector/InspectorFileSystemAgent.h b/WebCore/inspector/InspectorFileSystemAgent.h
index adb434d..a85ad0f 100644
--- a/WebCore/inspector/InspectorFileSystemAgent.h
+++ b/WebCore/inspector/InspectorFileSystemAgent.h
@@ -52,16 +52,17 @@ public:
}
~InspectorFileSystemAgent();
- void stop();
-
+ 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(InspectorController*, InspectorFrontend*);
void getFileSystemRoot(AsyncFileSystem::Type);
diff --git a/WebCore/inspector/front-end/FileSystemView.js b/WebCore/inspector/front-end/FileSystemView.js
index ae13db2..0c6636b 100644
--- a/WebCore/inspector/front-end/FileSystemView.js
+++ b/WebCore/inspector/front-end/FileSystemView.js
@@ -59,6 +59,7 @@ WebInspector.FileSystemView = function(treeElement, fileSystemOrigin)
this._temporaryRoot = "";
this._persistentRoot = "";
+ this._isFileSystemDisabled = false;
this._persistentRootError = false;
this._temporaryRootError = false;
this.fileSystemVisible = true;
@@ -117,6 +118,11 @@ WebInspector.FileSystemView.prototype = {
this.refreshFileSystem();
},
+ setFileSystemDisabled: function()
+ {
+ this._isFileSystemDisabled = true;
+ this.refreshFileSystem();
+ },
_selectFileSystemTab: function()
{
this._tabbedPane.selectTabById("persistent");
@@ -141,11 +147,13 @@ WebInspector.FileSystemView.prototype = {
{
fileSystemElement.removeChildren();
var rootPath = WebInspector.UIString("File System root path not available.");
- if (isError)
+ 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";
@@ -174,8 +182,8 @@ WebInspector.FileSystemView.prototype = {
refreshFileSystem: function()
{
- this._createTextAndButton(this._persistentFileSystemElement, this._persistentRoot, WebInspector.FileSystem.PERSISTENT, this._persistentRootError);
- this._createTextAndButton(this._tempFileSystemElement, this._temporaryRoot, WebInspector.FileSystem.TEMPORARY, this._temporaryRootError);
+ this._createTextAndButton(this._persistentFileSystemElement, this._persistentRoot, WebInspector.FileSystem.PERSISTENT, this._persistentRootError);
+ this._createTextAndButton(this._tempFileSystemElement, this._temporaryRoot, WebInspector.FileSystem.TEMPORARY, this._temporaryRootError);
},
}
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index dd6c818..7b3d2ac 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -596,6 +596,12 @@ WebInspector.StoragePanel.prototype = {
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)
{
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index bf7ec39..7c56eb5 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1287,6 +1287,11 @@ WebInspector.didGetFileSystemError = function(type, origin)
this.panels.storage.updateFileSystemError(type, origin);
}
+WebInspector.didGetFileSystemDisabled = function()
+{
+ this.panels.storage.setFileSystemDisabled();
+}
+
WebInspector.updateNetworkState = function(isNowOnline)
{
this.panels.storage.updateNetworkState(isNowOnline);
@@ -1366,9 +1371,6 @@ WebInspector.reset = function()
}
this.resources = {};
- this.cookieDomains = {};
- this.applicationCacheDomains = {};
- this.fileSystemOrigins = {};
this.highlightDOMNode(0);
this.console.clearMessages();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index deb9db3..c9e790b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-04 Kavita Kanetkar <kkanetkar at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Web Inspector: Enable files ystem UI for chromium
+ https://bugs.webkit.org/show_bug.cgi?id=48963
+
+ * src/js/DevTools.js:
+
2010-11-03 Adam Barth <abarth at webkit.org>
Roll Chromium DEPS
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index 74b6bd9..e1d948a 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -46,8 +46,7 @@ var context = {}; // Used by WebCore's inspector routines.
Preferences.canEditScriptSource = true;
Preferences.onlineDetectionEnabled = false;
Preferences.nativeInstrumentationEnabled = true;
- // FIXME: Turn this to whatever the value of --enable-file-system for chrome.
- Preferences.fileSystemEnabled = false;
+ Preferences.fileSystemEnabled = true;
})();
var devtools = devtools || {};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list