chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js - Issue 177049: On Linux, move the passing of filedescriptors to a dedicated socketpair().

Unified Diff: chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js

Issue 177049: On Linux, move the passing of filedescriptors to a dedicated socketpair(). (Closed)

Patch Set: Removed *.d files from reference build Created 11 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/tools/test/reference_build/chrome_linux/resources/inspector/treeoutline.js ('k') | chrome/tools/test/reference_build/chrome_linux/themes/default.pak » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js

diff --git a/chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js b/chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js

index 8fb50e202ed7ebc3951f1941e86a335aba68ca88..d481b728e60c6eadd63e2697d8deed0993039da1 100644

--- a/chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js

+++ b/chrome/tools/test/reference_build/chrome_linux/resources/inspector/utilities.js

@@ -38,7 +38,7 @@ Object.type = function(obj, win)

win = win || window;

if (obj instanceof win.Node)

- return "node";

+ return (obj.nodeType === undefined ? type : "node");

if (obj instanceof win.String)

return "string";

if (obj instanceof win.Array)

@@ -56,6 +56,18 @@ Object.type = function(obj, win)

return type;

}

+Object.proxyType = function(objectProxy)

+ if (objectProxy === null)

+ return "null";

+ var type = typeof objectProxy;

+ if (type !== "object" && type !== "function")

+ return type;

+ return objectProxy.type;

Object.hasProperties = function(obj)

{

if (typeof obj === "undefined" || typeof obj === "null")

@@ -65,9 +77,9 @@ Object.hasProperties = function(obj)

return false;

}

-Object.describe = function(obj, abbreviated)

+Object.describe = function(obj, abbreviated, win)

{

- var type1 = Object.type(obj);

+ var type1 = Object.type(obj, win);

var type2 = Object.prototype.toString.call(obj).replace(/^\[object (.*)\]$/i, "$1");

switch (type1) {

@@ -94,15 +106,19 @@ Object.describe = function(obj, abbreviated)

}

-Object.sortedProperties = function(obj)

+Object.properties = function(obj)

{

var properties = [];

for (var prop in obj)

properties.push(prop);

- properties.sort();

return properties;

}

+Object.sortedProperties = function(obj, sortFunc)

+ return Object.properties(obj).sort(sortFunc);

Function.prototype.bind = function(thisObject)

{

var func = this;

@@ -234,7 +250,7 @@ Element.prototype.hasStyleClass = function(className)

Node.prototype.enclosingNodeOrSelfWithNodeNameInArray = function(nameArray)

{

- for (var node = this; node && !objectsAreSame(node, this.ownerDocument); node = node.parentNode)

+ for (var node = this; node && node !== this.ownerDocument; node = node.parentNode)

for (var i = 0; i < nameArray.length; ++i)

if (node.nodeName.toLowerCase() === nameArray[i].toLowerCase())

return node;

@@ -248,7 +264,7 @@ Node.prototype.enclosingNodeOrSelfWithNodeName = function(nodeName)

Node.prototype.enclosingNodeOrSelfWithClass = function(className)

{

- for (var node = this; node && !objectsAreSame(node, this.ownerDocument); node = node.parentNode)

+ for (var node = this; node && node !== this.ownerDocument; node = node.parentNode)

if (node.nodeType === Node.ELEMENT_NODE && node.hasStyleClass(className))

return node;

return null;

@@ -301,12 +317,12 @@ Element.prototype.firstChildSkippingWhitespace = firstChildSkippingWhitespace;

Element.prototype.lastChildSkippingWhitespace = lastChildSkippingWhitespace;

Node.prototype.isWhitespace = isNodeWhitespace;

-Node.prototype.nodeTypeName = nodeTypeName;

Node.prototype.displayName = nodeDisplayName;

-Node.prototype.contentPreview = nodeContentPreview;

-Node.prototype.isAncestor = isAncestorNode;

+Node.prototype.isAncestor = function(node)

+ return isAncestorNode(this, node);

+};

Node.prototype.isDescendant = isDescendantNode;

-Node.prototype.firstCommonAncestor = firstCommonNodeAncestor;

Node.prototype.nextSiblingSkippingWhitespace = nextSiblingSkippingWhitespace;

Node.prototype.previousSiblingSkippingWhitespace = previousSiblingSkippingWhitespace;

Node.prototype.traverseNextNode = traverseNextNode;

@@ -381,113 +397,6 @@ String.prototype.trimURL = function(baseURLDomain)

return result;

}

-function getStyleTextWithShorthands(style)

- var cssText = "";

- var foundProperties = {};

- for (var i = 0; i < style.length; ++i) {

- var individualProperty = style[i];

- var shorthandProperty = style.getPropertyShorthand(individualProperty);

- var propertyName = (shorthandProperty || individualProperty);

- if (propertyName in foundProperties)

- continue;

- if (shorthandProperty) {

- var value = getShorthandValue(style, shorthandProperty);

- var priority = getShorthandPriority(style, shorthandProperty);

- } else {

- var value = style.getPropertyValue(individualProperty);

- var priority = style.getPropertyPriority(individualProperty);

- }

- foundProperties[propertyName] = true;

- cssText += propertyName + ": " + value;

- if (priority)

- cssText += " !" + priority;

- cssText += "; ";

- }

- return cssText;

-function getShorthandValue(style, shorthandProperty)

- var value = style.getPropertyValue(shorthandProperty);

- if (!value) {

- // Some shorthands (like border) return a null value, so compute a shorthand value.

- // FIXME: remove this when http://bugs.webkit.org/show_bug.cgi?id=15823 is fixed.

- var foundProperties = {};

- for (var i = 0; i < style.length; ++i) {

- var individualProperty = style[i];

- if (individualProperty in foundProperties || style.getPropertyShorthand(individualProperty) !== shorthandProperty)

- continue;

- var individualValue = style.getPropertyValue(individualProperty);

- if (style.isPropertyImplicit(individualProperty) || individualValue === "initial")

- continue;

- foundProperties[individualProperty] = true;

- if (!value)

- value = "";

- else if (value.length)

- value += " ";

- value += individualValue;

- }

- return value;

-function getShorthandPriority(style, shorthandProperty)

- var priority = style.getPropertyPriority(shorthandProperty);

- if (!priority) {

- for (var i = 0; i < style.length; ++i) {

- var individualProperty = style[i];

- if (style.getPropertyShorthand(individualProperty) !== shorthandProperty)

- continue;

- priority = style.getPropertyPriority(individualProperty);

- break;

- }

- return priority;

-function getLonghandProperties(style, shorthandProperty)

- var properties = [];

- var foundProperties = {};

- for (var i = 0; i < style.length; ++i) {

- var individualProperty = style[i];

- if (individualProperty in foundProperties || style.getPropertyShorthand(individualProperty) !== shorthandProperty)

- continue;

- foundProperties[individualProperty] = true;

- properties.push(individualProperty);

- }

- return properties;

-function getUniqueStyleProperties(style)

- var properties = [];

- var foundProperties = {};

- for (var i = 0; i < style.length; ++i) {

- var property = style[i];

- if (property in foundProperties)

- continue;

- foundProperties[property] = true;

- properties.push(property);

- }

- return properties;

function isNodeWhitespace()

{

if (!this || this.nodeType !== Node.TEXT_NODE)

@@ -497,29 +406,6 @@ function isNodeWhitespace()

return this.nodeValue.match(/^[\s\xA0]+$/);

}

-function nodeTypeName()

- if (!this)

- return "(unknown)";

- switch (this.nodeType) {

- case Node.ELEMENT_NODE: return "Element";

- case Node.ATTRIBUTE_NODE: return "Attribute";

- case Node.TEXT_NODE: return "Text";

- case Node.CDATA_SECTION_NODE: return "Character Data";

- case Node.ENTITY_REFERENCE_NODE: return "Entity Reference";

- case Node.ENTITY_NODE: return "Entity";

- case Node.PROCESSING_INSTRUCTION_NODE: return "Processing Instruction";

- case Node.COMMENT_NODE: return "Comment";

- case Node.DOCUMENT_NODE: return "Document";

- case Node.DOCUMENT_TYPE_NODE: return "Document Type";

- case Node.DOCUMENT_FRAGMENT_NODE: return "Document Fragment";

- case Node.NOTATION_NODE: return "Notation";

- }

- return "(unknown)";

function nodeDisplayName()

{

if (!this)

@@ -594,90 +480,23 @@ function nodeDisplayName()

return this.nodeName.toLowerCase().collapseWhitespace();

}

-function nodeContentPreview()

+function isAncestorNode(ancestor, node)

{

- if (!this || !this.hasChildNodes || !this.hasChildNodes())

- return "";

- var limit = 0;

- var preview = "";

- // always skip whitespace here

- var currentNode = traverseNextNode.call(this, true, this);

- while (currentNode) {

- if (currentNode.nodeType === Node.TEXT_NODE)

- preview += currentNode.nodeValue.escapeHTML();

- else

- preview += nodeDisplayName.call(currentNode).escapeHTML();

- currentNode = traverseNextNode.call(currentNode, true, this);

- if (++limit > 4) {

- preview += "…"; // ellipsis

- break;

- }

- return preview.collapseWhitespace();

-function objectsAreSame(a, b)

- // FIXME: Make this more generic so is works with any wrapped object, not just nodes.

- // This function is used to compare nodes that might be JSInspectedObjectWrappers, since

- // JavaScript equality is not true for JSInspectedObjectWrappers of the same node wrapped

- // with different global ExecStates, we use isSameNode to compare them.

- if (a === b)

- return true;

- if (!a || !b)

- return false;

- if (a.isSameNode && b.isSameNode)

- return a.isSameNode(b);

- return false;

-function isAncestorNode(ancestor)

- if (!this || !ancestor)

+ if (!node || !ancestor)

return false;

- var currentNode = ancestor.parentNode;

+ var currentNode = node.parentNode;

while (currentNode) {

- if (objectsAreSame(this, currentNode))

+ if (ancestor === currentNode)

return true;

currentNode = currentNode.parentNode;

}

return false;

}

function isDescendantNode(descendant)

{

- return isAncestorNode.call(descendant, this);

-function firstCommonNodeAncestor(node)

- if (!this || !node)

- return;

- var node1 = this.parentNode;

- var node2 = node.parentNode;

- if ((!node1 || !node2) || !objectsAreSame(node1, node2))

- return null;

- while (node1 && node2) {

- if (!node1.parentNode || !node2.parentNode)

- break;

- if (!objectsAreSame(node1, node2))

- break;

- node1 = node1.parentNode;

- node2 = node2.parentNode;

- }

- return node1;

+ return isAncestorNode(descendant, this);

}

function nextSiblingSkippingWhitespace()

@@ -729,7 +548,7 @@ function traverseNextNode(skipWhitespace, stayWithin)

if (node)

return node;

- if (stayWithin && objectsAreSame(this, stayWithin))

+ if (stayWithin && this === stayWithin)

return null;

node = skipWhitespace ? nextSiblingSkippingWhitespace.call(this) : this.nextSibling;

@@ -737,7 +556,7 @@ function traverseNextNode(skipWhitespace, stayWithin)

return node;

node = this;

- while (node && !(skipWhitespace ? nextSiblingSkippingWhitespace.call(node) : node.nextSibling) && (!stayWithin || !node.parentNode || !objectsAreSame(node.parentNode, stayWithin)))

+ while (node && !(skipWhitespace ? nextSiblingSkippingWhitespace.call(node) : node.nextSibling) && (!stayWithin || !node.parentNode || node.parentNode !== stayWithin))

node = node.parentNode;

if (!node)

return null;

@@ -749,7 +568,7 @@ function traversePreviousNode(skipWhitespace, stayWithin)

{

if (!this)

return;

- if (stayWithin && objectsAreSame(this, stayWithin))

+ if (stayWithin && this === stayWithin)

return null;

var node = skipWhitespace ? previousSiblingSkippingWhitespace.call(this) : this.previousSibling;

while (node && (skipWhitespace ? lastChildSkippingWhitespace.call(node) : node.lastChild) )

@@ -850,21 +669,8 @@ function getDocumentForNode(node) {

return node.nodeType == Node.DOCUMENT_NODE ? node : node.ownerDocument;

}

-function parentNodeOrFrameElement(node) {

- var parent = node.parentNode;

- if (parent)

- return parent;

- return getDocumentForNode(node).defaultView.frameElement;

-function isAncestorIncludingParentFrames(a, b) {

- if (objectsAreSame(a, b))

- return false;

- for (var node = b; node; node = getDocumentForNode(node).defaultView.frameElement)

- if (objectsAreSame(a, node) || isAncestorNode.call(a, node))

- return true;

- return false;

+function parentNode(node) {

+ return node.parentNode;

}

Number.secondsToString = function(seconds, formatterFunction, higherResolution)

@@ -893,20 +699,27 @@ Number.secondsToString = function(seconds, formatterFunction, higherResolution)

return formatterFunction("%.1f days", days);

}

-Number.bytesToString = function(bytes, formatterFunction)

+Number.bytesToString = function(bytes, formatterFunction, higherResolution)

{

if (!formatterFunction)

formatterFunction = String.sprintf;

+ if (typeof higherResolution === "undefined")

+ higherResolution = true;

if (bytes < 1024)

return formatterFunction("%.0fB", bytes);

var kilobytes = bytes / 1024;

- if (kilobytes < 1024)

+ if (higherResolution && kilobytes < 1024)

return formatterFunction("%.2fKB", kilobytes);

+ else if (kilobytes < 1024)

+ return formatterFunction("%.0fKB", kilobytes);

var megabytes = kilobytes / 1024;

- return formatterFunction("%.3fMB", megabytes);

+ if (higherResolution)

+ return formatterFunction("%.3fMB", megabytes);

+ else

+ return formatterFunction("%.0fMB", megabytes);

}

Number.constrain = function(num, min, max)