[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
caseq at chromium.org
caseq at chromium.org
Wed Dec 22 12:42:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 93cbd8e5e1c9e71289b0c37a57a14cdbae71f998
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 14:11:01 2010 +0000
2010-08-27 Andrey Kosyakov <caseq at chromium.org>
Unreviewed build fix.
Web Inspector: add audits support to extension API
Byuild fix: added missing files.
https://bugs.webkit.org/show_bug.cgi?id=44518
* inspector/front-end/AuditFormatters.js: Added.
(WebInspector.applyFormatters):
(WebInspector.AuditFormatters.text):
(WebInspector.AuditFormatters.snippet):
(WebInspector.AuditFormatters.concat):
(WebInspector.AuditFormatters.url):
* inspector/front-end/ExtensionAuditCategory.js: Added.
(WebInspector.ExtensionAuditCategory):
(WebInspector.ExtensionAuditCategory.prototype.get id):
(WebInspector.ExtensionAuditCategory.prototype.get displayName):
(WebInspector.ExtensionAuditCategory.prototype.get ruleCount):
(WebInspector.ExtensionAuditCategory.prototype.run):
(WebInspector.ExtensionAuditCategoryResults):
(WebInspector.ExtensionAuditCategoryResults.prototype.get complete):
(WebInspector.ExtensionAuditCategoryResults.prototype.cancel):
(WebInspector.ExtensionAuditCategoryResults.prototype.addResult):
(WebInspector.ExtensionAuditCategoryResults.prototype._addNode):
(WebInspector.ExtensionAuditCategoryResults.prototype._addResult):
* inspector/front-end/ExtensionCommon.js: Added.
(WebInspector.commonExtensionSymbols):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66220 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ba67b5..31d3017 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2010-08-27 Andrey Kosyakov <caseq at chromium.org>
+
+ Unreviewed build fix.
+
+ Web Inspector: add audits support to extension API
+ Byuild fix: added missing files.
+ https://bugs.webkit.org/show_bug.cgi?id=44518
+
+ * inspector/front-end/AuditFormatters.js: Added.
+ (WebInspector.applyFormatters):
+ (WebInspector.AuditFormatters.text):
+ (WebInspector.AuditFormatters.snippet):
+ (WebInspector.AuditFormatters.concat):
+ (WebInspector.AuditFormatters.url):
+ * inspector/front-end/ExtensionAuditCategory.js: Added.
+ (WebInspector.ExtensionAuditCategory):
+ (WebInspector.ExtensionAuditCategory.prototype.get id):
+ (WebInspector.ExtensionAuditCategory.prototype.get displayName):
+ (WebInspector.ExtensionAuditCategory.prototype.get ruleCount):
+ (WebInspector.ExtensionAuditCategory.prototype.run):
+ (WebInspector.ExtensionAuditCategoryResults):
+ (WebInspector.ExtensionAuditCategoryResults.prototype.get complete):
+ (WebInspector.ExtensionAuditCategoryResults.prototype.cancel):
+ (WebInspector.ExtensionAuditCategoryResults.prototype.addResult):
+ (WebInspector.ExtensionAuditCategoryResults.prototype._addNode):
+ (WebInspector.ExtensionAuditCategoryResults.prototype._addResult):
+ * inspector/front-end/ExtensionCommon.js: Added.
+ (WebInspector.commonExtensionSymbols):
+
2010-08-26 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/front-end/AuditFormatters.js b/WebCore/inspector/front-end/AuditFormatters.js
new file mode 100755
index 0000000..de277ad
--- /dev/null
+++ b/WebCore/inspector/front-end/AuditFormatters.js
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.applyFormatters = function(value)
+{
+ var formatter;
+ var type = typeof value;
+ var args;
+
+ switch (type) {
+ case "string":
+ case "boolean":
+ case "number":
+ formatter = WebInspector.AuditFormatters.text;
+ args = [ value.toString() ];
+ break;
+
+ case "object":
+ if (value instanceof Array) {
+ formatter = WebInspector.AuditFormatters.concat;
+ args = value;
+ } else if (value.type && value.arguments) {
+ formatter = WebInspector.AuditFormatters[value.type];
+ args = value.arguments;
+ }
+ }
+ if (!formatter)
+ throw "Invalid value or formatter: " + type + JSON.stringify(value);
+
+ return formatter.apply(null, args);
+}
+
+WebInspector.AuditFormatters = {
+ text: function(text)
+ {
+ return document.createTextNode(text);
+ },
+
+ snippet: function(snippetText)
+ {
+ var div = document.createElement("div");
+ div.innerText = snippetText;
+ div.className = "source-code";
+ return div;
+ },
+
+ concat: function()
+ {
+ var parent = document.createElement("span");
+ for (var arg = 0; arg < arguments.length; ++arg)
+ parent.appendChild(WebInspector.applyFormatters(arguments[arg]));
+ return parent;
+ },
+
+ url: function(url, displayText)
+ {
+ return WebInspector.linkifyURLAsNode(url, displayText || url, null, (url in WebInspector.resourceURLMap));
+ }
+};
diff --git a/WebCore/inspector/front-end/ExtensionAuditCategory.js b/WebCore/inspector/front-end/ExtensionAuditCategory.js
new file mode 100644
index 0000000..5d155d7
--- /dev/null
+++ b/WebCore/inspector/front-end/ExtensionAuditCategory.js
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.ExtensionAuditCategory = function(id, displayName, ruleCount)
+{
+ this._id = id;
+ this._displayName = displayName;
+ this._ruleCount = ruleCount;
+}
+
+WebInspector.ExtensionAuditCategory.prototype = {
+ // AuditCategory interface
+ get id()
+ {
+ return this._id;
+ },
+
+ get displayName()
+ {
+ return this._displayName;
+ },
+
+ get ruleCount()
+ {
+ return this._ruleCount;
+ },
+
+ run: function(resources, callback)
+ {
+ new WebInspector.ExtensionAuditCategoryResults(this, callback);
+ }
+}
+
+WebInspector.ExtensionAuditCategoryResults = function(category, callback)
+{
+ this._category = category;
+ this._pendingRules = category.ruleCount;
+ this._ruleCompletionCallback = callback;
+
+ this.id = category.id + "-" + ++WebInspector.ExtensionAuditCategoryResults._lastId;
+ WebInspector.extensionServer.startAuditRun(category, this);
+}
+
+WebInspector.ExtensionAuditCategoryResults.prototype = {
+ get complete()
+ {
+ return !this._pendingRules;
+ },
+
+ cancel: function()
+ {
+ while (!this.complete)
+ this._addResult(null);
+ },
+
+ addResult: function(displayName, description, severity, details)
+ {
+ var result = new WebInspector.AuditRuleResult(displayName);
+ result.addChild(description);
+ result.severity = severity;
+ if (details)
+ this._addNode(result, details);
+ this._addResult(result);
+ },
+
+ _addNode: function(parent, node)
+ {
+ var addedNode = parent.addChild(node.contents, node.expanded);
+ if (node.children) {
+ for (var i = 0; i < node.children.length; ++i)
+ this._addNode(addedNode, node.children[i]);
+ }
+ },
+
+ _addResult: function(result)
+ {
+ this._ruleCompletionCallback(result);
+ this._pendingRules--;
+ if (!this._pendingRules)
+ WebInspector.extensionServer.stopAuditRun(this);
+ }
+}
+
+WebInspector.ExtensionAuditCategoryResults._lastId = 0;
diff --git a/WebCore/inspector/front-end/ExtensionCommon.js b/WebCore/inspector/front-end/ExtensionCommon.js
new file mode 100644
index 0000000..b04c18c
--- /dev/null
+++ b/WebCore/inspector/front-end/ExtensionCommon.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.commonExtensionSymbols = function(private)
+{
+
+ if (!private.audits)
+ private.audits = {};
+
+ private.audits.Severity = {
+ Info: "info",
+ Warning: "warning",
+ Severe: "severe"
+ };
+}
+
+WebInspector.extensionAPI = {};
+
+WebInspector.commonExtensionSymbols(WebInspector.extensionAPI);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list