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 955891 - Part 2: Cleopatra: Fix misspellings of "contiguous". r=anton

Browse Source
This commit is contained in:
Chris Peterson 2013-12-31 17:55:00 -08:00
parent 04391d6b95
commit 347608f8bc
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/devtools/profiler/cleopatra/js/tree.js
View File

@ -176,7 +176,7 @@ TreeView.prototype = {
this.restoreSelectionSnapshot(frames, false);
},
// Take a selection snapshot and restore the selection
restoreSelectionSnapshot: function TreeView_restoreSelectionSnapshot(snapshot, allowNonContigious) {
restoreSelectionSnapshot: function TreeView_restoreSelectionSnapshot(snapshot, allowNonContiguous) {
var currNode = this._horizontalScrollbox.firstChild;
if (currNode.data.name == snapshot[0] || snapshot[0] == "(total)") {
snapshot.shift();
@ -193,7 +193,7 @@ TreeView.prototype = {
continue next_level;
}
}
if (allowNonContigious === true) {
if (allowNonContiguous) {
// We need to do a Breadth-first search to find a match
var pendingSearch = [currNode.data];
while (pendingSearch.length > 0) {

15
browser/devtools/profiler/cleopatra/js/ui.js
View File

@ -184,6 +184,7 @@ function ProfileTreeManager() {
// If this is set when the tree changes the snapshot is immediately restored.
this._savedSnapshot = null;
this._allowNonContiguous = false;
}
ProfileTreeManager.prototype = {
getContainer: function ProfileTreeManager_getContainer() {
@ -210,8 +211,8 @@ ProfileTreeManager.prototype = {
restoreSerializedSelectionSnapshot: function ProfileTreeManager_restoreSerializedSelectionSnapshot(selection) {
this._savedSnapshot = JSON.parse(selection);
},
_restoreSelectionSnapshot: function ProfileTreeManager__restoreSelectionSnapshot(snapshot, allowNonContigous) {
return this.treeView.restoreSelectionSnapshot(snapshot, allowNonContigous);
_restoreSelectionSnapshot: function ProfileTreeManager__restoreSelectionSnapshot(snapshot, allowNonContiguous) {
return this.treeView.restoreSelectionSnapshot(snapshot, allowNonContiguous);
},
setSelection: function ProfileTreeManager_setSelection(frames) {
return this.treeView.setSelection(frames);
@ -267,16 +268,16 @@ ProfileTreeManager.prototype = {
focusOnCallstack(focusedCallstack, node.name);
}
},
setAllowNonContigous: function ProfileTreeManager_setAllowNonContigous() {
this._allowNonContigous = true;
setAllowNonContiguous: function ProfileTreeManager_setAllowNonContiguous() {
this._allowNonContiguous = true;
},
display: function ProfileTreeManager_display(tree, symbols, functions, resources, useFunctions, filterByName) {
this.treeView.display(this.convertToJSTreeData(tree, symbols, functions, useFunctions), resources, filterByName);
if (this._savedSnapshot) {
var old = this._savedSnapshot.clone();
this._restoreSelectionSnapshot(this._savedSnapshot, this._allowNonContigous);
this._restoreSelectionSnapshot(this._savedSnapshot, this._allowNonContiguous);
this._savedSnapshot = old;
this._allowNonContigous = false;
this._allowNonContiguous = false;
}
},
convertToJSTreeData: function ProfileTreeManager__convertToJSTreeData(rootNode, symbols, functions, useFunctions) {
@ -1536,7 +1537,7 @@ function toggleJavascriptOnly() {
// When going from JS only to non js there's going to be new C++
// frames in the selection so we need to restore the selection
// while allowing non contigous symbols to be in the stack (the c++ ones)
gTreeManager.setAllowNonContigous();
gTreeManager.setAllowNonContiguous();
}
gJavascriptOnly = !gJavascriptOnly;
gTreeManager.saveSelectionSnapshot(gJavascriptOnly);