Diff
Modified: trunk/Source/WebCore/ChangeLog (101670 => 101671)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 16:22:14 UTC (rev 101671)
@@ -1,5 +1,34 @@
2011-12-01 Pavel Feldman <[email protected]>
+ Web Inspector: further align front-end configurations: get rid of saveAsAvailable preference, inline drag glass pane.
+ https://bugs.webkit.org/show_bug.cgi?id=73555
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/InspectorFrontendClient.h:
+ * inspector/InspectorFrontendClientLocal.h:
+ (WebCore::InspectorFrontendClientLocal::canSaveAs):
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::canSaveAs):
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+ * inspector/front-end/ExtensionServer.js:
+ (WebInspector.ExtensionServer.prototype.hasExtensions):
+ * inspector/front-end/InspectorFrontendHostStub.js:
+ (.WebInspector.InspectorFrontendHostStub.prototype.canSaveAs):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._contextMenu):
+ * inspector/front-end/ResourcesPanel.js:
+ * inspector/front-end/Settings.js:
+ * inspector/front-end/SettingsScreen.js:
+ (WebInspector.SettingsScreen):
+ * inspector/front-end/StylesSidebarPane.js:
+ * inspector/front-end/UIUtils.js:
+ (WebInspector.elementDragStart):
+ (WebInspector.elementDragEnd):
+
+2011-12-01 Pavel Feldman <[email protected]>
+
Web Inspector: extract static part of the InspectorBackend from the generator.
https://bugs.webkit.org/show_bug.cgi?id=73562
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClient.h (101670 => 101671)
--- trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2011-12-01 16:22:14 UTC (rev 101671)
@@ -57,6 +57,7 @@
virtual void requestAttachWindow() = 0;
virtual void requestDetachWindow() = 0;
virtual void changeAttachedWindowHeight(unsigned) = 0;
+ virtual bool canSaveAs() = 0;
virtual void saveAs(const WTF::String& fileName, const WTF::String& content) = 0;
virtual void inspectedURLChanged(const String&) = 0;
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h (101670 => 101671)
--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2011-12-01 16:22:14 UTC (rev 101671)
@@ -66,6 +66,7 @@
virtual void requestAttachWindow();
virtual void requestDetachWindow();
virtual void changeAttachedWindowHeight(unsigned);
+ virtual bool canSaveAs() { return false; }
virtual void saveAs(const String&, const String&) { }
virtual void attachWindow() = 0;
Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (101670 => 101671)
--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2011-12-01 16:22:14 UTC (rev 101671)
@@ -214,6 +214,13 @@
Pasteboard::generalPasteboard()->writePlainText(text);
}
+bool InspectorFrontendHost::canSaveAs()
+{
+ if (m_client)
+ return m_client->canSaveAs();
+ return false;
+}
+
void InspectorFrontendHost::saveAs(const String& fileName, const String& content)
{
if (m_client)
Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (101670 => 101671)
--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2011-12-01 16:22:14 UTC (rev 101671)
@@ -72,6 +72,7 @@
String hiddenPanels();
void copyText(const String& text);
+ bool canSaveAs();
void saveAs(const String& fileName, const String& content);
// Called from [Custom] implementations.
Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (101670 => 101671)
--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2011-12-01 16:22:14 UTC (rev 101671)
@@ -49,6 +49,7 @@
DOMString hiddenPanels();
void copyText(in DOMString text);
+ boolean canSaveAs();
void saveAs(in DOMString fileName, in DOMString content);
[Custom] DOMString platform();
Modified: trunk/Source/WebCore/inspector/front-end/ExtensionServer.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -75,6 +75,11 @@
}
WebInspector.ExtensionServer.prototype = {
+ hasExtensions: function()
+ {
+ return !!Object.keys(this._registeredExtensions).length;
+ },
+
notifySearchAction: function(panelId, action, searchString)
{
this._postNotification(WebInspector.extensionAPI.Events.PanelSearch + panelId, action, searchString);
Modified: trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -112,6 +112,11 @@
{
},
+ canSaveAs: function(fileName, content)
+ {
+ return true;
+ },
+
saveAs: function(fileName, content)
{
var builder = new WebKitBlobBuilder();
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -944,7 +944,7 @@
}
contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Copy all as HAR" : "Copy All as HAR"), this._copyAll.bind(this));
- if (Preferences.saveAsAvailable) {
+ if (InspectorFrontendHost.canSaveAs()) {
contextMenu.appendSeparator();
if (resource)
contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Save entry as HAR" : "Save Entry as HAR"), this._exportResource.bind(this, resource));
Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -1254,7 +1254,7 @@
_appendSaveAsAction: function(contextMenu, event)
{
- if (!Preferences.saveAsAvailable)
+ if (!InspectorFrontendHost.canSaveAs())
return;
if (this._resource.type !== WebInspector.Resource.Type.Document &&
@@ -1663,7 +1663,7 @@
var contextMenu = new WebInspector.ContextMenu();
contextMenu.appendItem(WebInspector.UIString("Revert to this revision"), this._revision.revertToThis.bind(this._revision));
- if (Preferences.saveAsAvailable) {
+ if (InspectorFrontendHost.canSaveAs()) {
function save()
{
var fileName = this._revision.resource.displayName;
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -37,10 +37,7 @@
minScriptsSidebarWidth: 200,
styleRulesExpandedState: {},
showMissingLocalizedStrings: false,
- showColorNicknames: true,
- saveAsAvailable: false,
useLowerCaseMenuTitlesOnWindows: false,
- hasExtensions: false,
sharedWorkersDebugNote: undefined,
localizeUI: true,
exposeDisableCache: false,
Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -71,7 +71,7 @@
p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Log XMLHttpRequests"), WebInspector.settings.monitoringXHREnabled));
p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Preserve log upon navigation"), WebInspector.settings.preserveConsoleLog));
- if (Preferences.hasExtensions) {
+ if (WebInspector.extensionServer.hasExtensions()) {
var handlerSelector = new WebInspector.HandlerSelector(WebInspector.openAnchorLocationRegistry);
p = this._appendSection(WebInspector.UIString("Extensions"), true);
p.appendChild(this._createCustomSetting(WebInspector.UIString("Open links in"), handlerSelector.element));
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -1607,7 +1607,7 @@
var formatSetting = WebInspector.settings.colorFormat.get();
if (formatSetting === cf.Original)
format = cf.Original;
- else if (Preferences.showColorNicknames && color.nickname)
+ else if (color.nickname)
format = cf.Nickname;
else if (formatSetting === cf.RGB)
format = (color.simple ? cf.RGB : cf.RGBA);
Modified: trunk/Source/WebCore/inspector/front-end/UIUtils.js (101670 => 101671)
--- trunk/Source/WebCore/inspector/front-end/UIUtils.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebCore/inspector/front-end/UIUtils.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -34,6 +34,18 @@
if (WebInspector._elementDraggingEventListener || WebInspector._elementEndDraggingEventListener)
WebInspector.elementDragEnd(event);
+ if (element) {
+ // Install glass pane
+ if (WebInspector._elementDraggingGlassPane)
+ WebInspector._elementDraggingGlassPane.parentElement.removeChild(WebInspector._elementDraggingGlassPane);
+
+ var glassPane = document.createElement("div");
+ glassPane.style.cssText = "position:absolute;top:0;bottom:0;left:0;right:0;opacity:0;z-index:1";
+ glassPane.id = "glass-pane-for-drag";
+ element.ownerDocument.body.appendChild(glassPane);
+ WebInspector._elementDraggingGlassPane = glassPane;
+ }
+
WebInspector._elementDraggingEventListener = dividerDrag;
WebInspector._elementEndDraggingEventListener = elementDragEnd;
@@ -54,6 +66,10 @@
targetDocument.body.style.removeProperty("cursor");
+ if (WebInspector._elementDraggingGlassPane)
+ WebInspector._elementDraggingGlassPane.parentElement.removeChild(WebInspector._elementDraggingGlassPane);
+
+ delete WebInspector._elementDraggingGlassPane;
delete WebInspector._elementDraggingEventListener;
delete WebInspector._elementEndDraggingEventListener;
Modified: trunk/Source/WebKit/chromium/ChangeLog (101670 => 101671)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 16:22:14 UTC (rev 101671)
@@ -1,5 +1,17 @@
2011-12-01 Pavel Feldman <[email protected]>
+ Web Inspector: further align front-end configurations: get rid of saveAsAvailable preference, inline drag glass pane.
+ https://bugs.webkit.org/show_bug.cgi?id=73555
+
+ Reviewed by Yury Semikhatsky.
+
+ * src/InspectorFrontendClientImpl.cpp:
+ (WebKit::InspectorFrontendClientImpl::canSaveAs):
+ * src/InspectorFrontendClientImpl.h:
+ * src/js/DevTools.js:
+
+2011-12-01 Pavel Feldman <[email protected]>
+
Web Inspector: query backend for capabilities explicitly.
https://bugs.webkit.org/show_bug.cgi?id=73442
Modified: trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp (101670 => 101671)
--- trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp 2011-12-01 16:22:14 UTC (rev 101671)
@@ -124,6 +124,11 @@
m_client->saveAs(fileName, content);
}
+bool InspectorFrontendClientImpl::canSaveAs()
+{
+ return true;
+}
+
void InspectorFrontendClientImpl::inspectedURLChanged(const String& url)
{
m_frontendPage->mainFrame()->document()->setTitle("Developer Tools - " + url);
Modified: trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h (101670 => 101671)
--- trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h 2011-12-01 16:22:14 UTC (rev 101671)
@@ -65,6 +65,7 @@
virtual void requestAttachWindow();
virtual void requestDetachWindow();
virtual void changeAttachedWindowHeight(unsigned);
+ virtual bool canSaveAs();
virtual void saveAs(const WTF::String& fileName, const WTF::String& content);
virtual void inspectedURLChanged(const WTF::String&);
Modified: trunk/Source/WebKit/chromium/src/js/DevTools.js (101670 => 101671)
--- trunk/Source/WebKit/chromium/src/js/DevTools.js 2011-12-01 16:20:51 UTC (rev 101670)
+++ trunk/Source/WebKit/chromium/src/js/DevTools.js 2011-12-01 16:22:14 UTC (rev 101671)
@@ -34,10 +34,7 @@
*/
{(function () {
- Preferences.ignoreWhitespace = false;
- Preferences.saveAsAvailable = true;
Preferences.useLowerCaseMenuTitlesOnWindows = true;
- Preferences.hasExtensions = true;
Preferences.sharedWorkersDebugNote = "Shared workers can be inspected in the Task Manager";
Preferences.localizeUI = false;
Preferences.applicationTitle = "Developer Tools - %s";
@@ -45,44 +42,6 @@
Preferences.exposeWorkersInspection = true;
})();}
-/** Pending WebKit upstream by apavlov). Fixes iframe vs drag problem. */
-(function()
-{
- var glassPane = null;
-
- function showGlassPane(element)
- {
- hideGlassPane();
- glassPane = document.createElement("div");
- glassPane.style.cssText = "position:absolute;top:0;bottom:0;left:0;right:0;opacity:0;z-index:1";
- glassPane.id = "glass-pane-for-drag";
- element.ownerDocument.body.appendChild(glassPane);
- }
-
- function hideGlassPane()
- {
- if (glassPane) {
- glassPane.parentElement.removeChild(glassPane);
- glassPane = null;
- }
- }
-
- var originalDragStart = WebInspector.elementDragStart;
- WebInspector.elementDragStart = function(element)
- {
- if (element)
- showGlassPane(element);
- originalDragStart.apply(this, arguments);
- };
-
- var originalDragEnd = WebInspector.elementDragEnd;
- WebInspector.elementDragEnd = function()
- {
- originalDragEnd.apply(this, arguments);
- hideGlassPane();
- };
-})();
-
WebInspector.platformExtensionAPI = function(tabId)
{
function getTabId()
