wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 740662 - Replace InspectorStore dictionaries with Inspector instances. r=robcee

Browse Source
This commit is contained in:
Dave Camp 2012-04-19 11:13:42 -07:00
parent d8e646980d
commit 942b271dd8
4 changed files with 66 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
browser/devtools/highlighter/inspector.jsm
View File

@ -136,48 +136,6 @@ Inspector.prototype = {
return this._IUI.chromeWin;
},
/**
* Get a store object that will last for the lifetime
* of the current inspector. When the lifetime of this object is corrected,
* this won't be necessary; clients can just decorate the inspector object.
* See bug 740662.
*
* @param string aStoreID
* A string identification for the store.
*/
_getStore: function Inspector__getStore(aStoreID)
{
let storeID = "tool-store-" + aStoreID;
let store = this._getStoreValue(storeID);
if (!store) {
store = {};
this._setStoreValue(storeID, store);
}
return store;
},
/**
* Set a single value in the store.
*
* When this object replaces InspectorStore this can probably just be
* dropped in favor of decorating Inspector, see bug 740662.
*/
_setStoreValue: function Inspector__setStoreValue(aID, aValue)
{
this._IUI.store.setValue(this._winID, aID, aValue);
},
/**
* Set a single value in the store.
*
* When this object replaces InspectorStore this can probably just be
* dropped in favor of decorating Inspector, see bug 740662.
*/
_getStoreValue: function Inspector__getStoreValue(aID)
{
return this._IUI.store.getValue(this._winID, aID);
},
/**
* Notify the inspector that the current selection has changed.
*
@ -424,11 +382,11 @@ InspectorUI.prototype = {
if (this.treePanel.isOpen()) {
this.treePanel.close();
Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", false);
this.store.setValue(this.winID, "htmlPanelOpen", false);
this.currentInspector._htmlPanelOpen = false;
} else {
this.treePanel.open();
Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", true);
this.store.setValue(this.winID, "htmlPanelOpen", true);
this.currentInspector._htmlPanelOpen = true;
}
},
@ -515,7 +473,7 @@ InspectorUI.prototype = {
// initialize the highlighter
this.highlighter = new Highlighter(this.chromeWin);
this._currentInspector = new Inspector(this);
this.initializeStore();
this._sidebar = new InspectorStyleSidebar({
document: this.chromeDoc,
@ -556,28 +514,32 @@ InspectorUI.prototype = {
// Has this windowID been inspected before?
if (this.store.hasID(this.winID)) {
let selectedNode = this.store.getValue(this.winID, "selectedNode");
this._currentInspector = this.store.getInspector(this.winID);
let selectedNode = this.currentInspector._selectedNode;
if (selectedNode) {
this.inspectNode(selectedNode);
}
this.isDirty = this.store.getValue(this.winID, "isDirty");
this.isDirty = this.currentInspector._isDirty;
} else {
// First time inspecting, set state to no selection + live inspection.
this.store.addStore(this.winID);
this.store.setValue(this.winID, "selectedNode", null);
this.store.setValue(this.winID, "inspecting", true);
this.store.setValue(this.winID, "isDirty", this.isDirty);
let inspector = new Inspector(this);
this.store.addInspector(this.winID, inspector);
inspector._selectedNode = null;
inspector._inspecting = true;
inspector._isDirty = this.isDirty;
this.store.setValue(this.winID, "htmlPanelOpen",
Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen"));
inspector._htmlPanelOpen =
Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen");
this.store.setValue(this.winID, "sidebarOpen",
Services.prefs.getBoolPref("devtools.inspector.sidebarOpen"));
inspector._sidebarOpen =
Services.prefs.getBoolPref("devtools.inspector.sidebarOpen");
this.store.setValue(this.winID, "activeSidebar",
Services.prefs.getCharPref("devtools.inspector.activeSidebar"));
inspector._activeSidebar =
Services.prefs.getCharPref("devtools.inspector.activeSidebar");
this.win.addEventListener("pagehide", this, true);
this._currentInspector = inspector;
}
},
@ -616,12 +578,12 @@ InspectorUI.prototype = {
* Remove event listeners for document scrolling, resize,
* tabContainer.TabSelect and others.
*
* @param boolean aKeepStore
* Tells if you want the store associated to the current tab/window to
* be cleared or not. Set this to true to not clear the store, or false
* otherwise.
* @param boolean aKeepInspector
* Tells if you want the inspector associated to the current tab/window to
* be cleared or not. Set this to true to save the inspector, or false
* to destroy it.
*/
closeInspectorUI: function IUI_closeInspectorUI(aKeepStore)
closeInspectorUI: function IUI_closeInspectorUI(aKeepInspector)
{
// if currently editing an attribute value, closing the
// highlighter/HTML panel dismisses the editor
@ -644,18 +606,16 @@ InspectorUI.prototype = {
this.progressListener.destroy();
delete this.progressListener;
if (!aKeepStore) {
this.store.deleteStore(this.winID);
if (!aKeepInspector) {
this.win.removeEventListener("pagehide", this, true);
this.clearPseudoClassLocks();
} else {
// Update the store before closing.
// Update the inspector before closing.
if (this.selection) {
this.store.setValue(this.winID, "selectedNode",
this.selection);
this.currentInspector._selectedNode = this.selection;
}
this.store.setValue(this.winID, "inspecting", this.inspecting);
this.store.setValue(this.winID, "isDirty", this.isDirty);
this.currentInspector._inspecting = this.inspecting;
this.currentInspector._isDirty = this.isDirty;
}
if (this.store.isEmpty()) {
@ -682,6 +642,10 @@ InspectorUI.prototype = {
this.breadcrumbs = null;
}
delete this._currentInspector;
if (!aKeepInspector)
this.store.deleteInspector(this.winID);
this.inspectMenuitem.setAttribute("checked", false);
this.browser = this.win = null; // null out references to browser and window
this.winID = null;
@ -693,11 +657,9 @@ InspectorUI.prototype = {
delete this.stylePanel;
delete this.toolbar;
this._currentInspector._destroy();
delete this._currentInspector;
Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.CLOSED, null);
if (!aKeepStore)
if (!aKeepInspector)
Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.DESTROYED, winId);
},
@ -745,6 +707,7 @@ InspectorUI.prototype = {
} else {
this.select(null, true, true);
}
this.highlighter.lock();
this._notifySelected();
this._currentInspector._emit("locked");
@ -843,9 +806,6 @@ InspectorUI.prototype = {
highlighterReady: function IUI_highlighterReady()
{
// Setup the InspectorStore or restore state
this.initializeStore();
let self = this;
this.highlighter.addListener("locked", function() {
@ -864,7 +824,7 @@ InspectorUI.prototype = {
self.togglePseudoClassLock(aPseudo);
});
if (this.store.getValue(this.winID, "inspecting")) {
if (this.currentInspector._inspecting) {
this.startInspecting();
this.highlighter.unlock();
} else {
@ -875,11 +835,11 @@ InspectorUI.prototype = {
this.highlighter.highlight();
if (this.store.getValue(this.winID, "htmlPanelOpen")) {
if (this.currentInspector._htmlPanelOpen) {
this.treePanel.open();
}
if (this.store.getValue(this.winID, "sidebarOpen")) {
if (this.currentInspector._sidebarOpen) {
this._sidebar.show();
}
@ -944,7 +904,7 @@ InspectorUI.prototype = {
winID = this.getWindowID(win);
if (winID && winID != this.winID) {
this.store.deleteStore(winID);
this.store.deleteInspector(winID);
}
if (this.store.isEmpty()) {
@ -1173,18 +1133,19 @@ InspectorStore.prototype = {
},
/**
* Add a new store.
* Add a new inspector.
*
* @param string aID The Store ID you want created.
* @param Inspector aInspector The inspector to add.
* @returns boolean True if the store was added successfully, or false
* otherwise.
*/
addStore: function IS_addStore(aID)
addInspector: function IS_addInspector(aID, aInspector)
{
let result = false;
if (!(aID in this.store)) {
this.store[aID] = {};
this.store[aID] = aInspector;
this.length++;
result = true;
}
@ -1193,17 +1154,28 @@ InspectorStore.prototype = {
},
/**
* Delete a store by ID.
* Get the inspector for a window, if any.
*
* @param string aID The Store ID you want created.
*/
getInspector: function IS_getInspector(aID)
{
return this.store[aID] || null;
},
/**
* Delete an inspector by ID.
*
* @param string aID The store ID you want deleted.
* @returns boolean True if the store was removed successfully, or false
* otherwise.
*/
deleteStore: function IS_deleteStore(aID)
deleteInspector: function IS_deleteInspector(aID)
{
let result = false;
if (aID in this.store) {
this.store[aID]._destroy();
delete this.store[aID];
this.length--;
result = true;
@ -1222,63 +1194,6 @@ InspectorStore.prototype = {
{
return (aID in this.store);
},
/**
* Retrieve a value from a store for a given key.
*
* @param string aID The store ID you want to read the value from.
* @param string aKey The key name of the value you want.
* @returns mixed the value associated to your store and key.
*/
getValue: function IS_getValue(aID, aKey)
{
if (!this.hasID(aID))
return null;
if (aKey in this.store[aID])
return this.store[aID][aKey];
return null;
},
/**
* Set a value for a given key and store.
*
* @param string aID The store ID where you want to store the value into.
* @param string aKey The key name for which you want to save the value.
* @param mixed aValue The value you want stored.
* @returns boolean True if the value was stored successfully, or false
* otherwise.
*/
setValue: function IS_setValue(aID, aKey, aValue)
{
let result = false;
if (aID in this.store) {
this.store[aID][aKey] = aValue;
result = true;
}
return result;
},
/**
* Delete a value for a given key and store.
*
* @param string aID The store ID where you want to store the value into.
* @param string aKey The key name for which you want to save the value.
* @returns boolean True if the value was removed successfully, or false
* otherwise.
*/
deleteValue: function IS_deleteValue(aID, aKey)
{
let result = false;
if (aID in this.store && aKey in this.store[aID]) {
delete this.store[aID][aKey];
result = true;
}
return result;
}
};
/**
@ -1597,7 +1512,7 @@ InspectorStyleSidebar.prototype = {
this._showDefault();
this._inspector._setStoreValue("sidebarOpen", true);
this._inspector._sidebarOpen = true;
Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", true);
},
@ -1607,7 +1522,7 @@ InspectorStyleSidebar.prototype = {
hide: function ISS_hide()
{
this._teardown();
this._inspector._setStoreValue("sidebarOpen", false);
this._inspector._sidebarOpen = false;
Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", false);
},
@ -1630,7 +1545,7 @@ InspectorStyleSidebar.prototype = {
activatePanel: function ISS_activatePanel(aID) {
let tool = this._tools[aID];
Services.prefs.setCharPref("devtools.inspector.activeSidebar", aID);
this._inspector._setStoreValue("activeSidebar", aID);
this._inspector._activeSidebar = aID;
this._deck.selectedPanel = tool.frame;
this._showContent(tool);
tool.button.setAttribute("checked", "true");
@ -1714,7 +1629,7 @@ InspectorStyleSidebar.prototype = {
return;
}
let activeID = this._inspector._getStoreValue("activeSidebar");
let activeID = this._inspector._activeSidebar;
if (!activeID || !(activeID in this._tools)) {
activeID = Object.getOwnPropertyNames(this._tools)[0];
}

1
browser/devtools/highlighter/test/Makefile.in
View File

@ -49,7 +49,6 @@ _BROWSER_FILES = \
browser_inspector_highlighter.js \
browser_inspector_iframeTest.js \
browser_inspector_scrolling.js \
browser_inspector_store.js \
browser_inspector_tab_switch.js \
browser_inspector_treePanel_output.js \
browser_inspector_treePanel_input.html \

106
browser/devtools/highlighter/test/browser_inspector_store.js
View File

@ -1,106 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Inspector Store Tests.
*
* The Initial Developer of the Original Code is
* The Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Mihai Șucan <mihai.sucan@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function test()
{
let InspectorStore = InspectorUI.store;
is(InspectorStore.length, 0, "InspectorStore is empty");
ok(InspectorStore.isEmpty(), "InspectorStore is empty (confirmed)");
is(typeof InspectorStore.store, "object",
"InspectorStore.store is an object");
ok(InspectorStore.addStore("foo"), "addStore('foo') returns true");
is(InspectorStore.length, 1, "InspectorStore.length = 1");
ok(!InspectorStore.isEmpty(), "InspectorStore is not empty");
is(typeof InspectorStore.store.foo, "object", "store.foo is an object");
ok(InspectorStore.addStore("fooBar"), "addStore('fooBar') returns true");
is(InspectorStore.length, 2, "InspectorStore.length = 2");
is(typeof InspectorStore.store.fooBar, "object", "store.fooBar is an object");
ok(!InspectorStore.addStore("fooBar"), "addStore('fooBar') returns false");
ok(InspectorStore.deleteStore("fooBar"),
"deleteStore('fooBar') returns true");
is(InspectorStore.length, 1, "InspectorStore.length = 1");
ok(!InspectorStore.store.fooBar, "store.fooBar is deleted");
ok(!InspectorStore.deleteStore("fooBar"),
"deleteStore('fooBar') returns false");
ok(!InspectorStore.hasID("fooBar"), "hasID('fooBar') returns false");
ok(InspectorStore.hasID("foo"), "hasID('foo') returns true");
ok(InspectorStore.setValue("foo", "key1", "val1"), "setValue() returns true");
ok(!InspectorStore.setValue("fooBar", "key1", "val1"),
"setValue() returns false");
is(InspectorStore.getValue("foo", "key1"), "val1",
"getValue() returns the correct value");
is(InspectorStore.store.foo.key1, "val1", "store.foo.key1 = 'val1'");
ok(!InspectorStore.getValue("fooBar", "key1"),
"getValue() returns null for unknown store");
ok(!InspectorStore.getValue("fooBar", "key1"),
"getValue() returns null for unknown store");
ok(InspectorStore.deleteValue("foo", "key1"),
"deleteValue() returns true for known value");
ok(!InspectorStore.store.foo.key1, "deleteValue() removed the value.");
ok(!InspectorStore.deleteValue("fooBar", "key1"),
"deleteValue() returns false for unknown store.");
ok(!InspectorStore.deleteValue("foo", "key1"),
"deleteValue() returns false for unknown value.");
ok(InspectorStore.deleteStore("foo"), "deleteStore('foo') returns true");
ok(InspectorStore.isEmpty(), "InspectorStore is empty");
}

6
browser/devtools/styleinspector/StyleInspector.jsm
View File

@ -100,7 +100,11 @@ function RuleViewTool(aInspector, aFrame)
this.inspector = aInspector;
this.chromeWindow = this.inspector.chromeWindow;
this.doc = aFrame.contentDocument;
this.view = new CssRuleView(this.doc, aInspector._getStore("ruleview"));
if (!this.inspector._ruleViewStore) {
this.inspector._ruleViewStore = {};
}
this.view = new CssRuleView(this.doc, this.inspector._ruleViewStore);
this.doc.documentElement.appendChild(this.view.element);
this._changeHandler = function() {