gecko/dom/manifest/ValueExtractor.jsm
Marcos Caceres 1d3b143a7f Bug 1171200 - Add means of checking if a document links to a manifest. r=billm.
---
 dom/ipc/manifestMessages.js                        | 166 +++++++++-----------
 ...ObjectProcessor.js => ImageObjectProcessor.jsm} |   0
 dom/manifest/ManifestFinder.jsm                    |  58 +++++++
 dom/manifest/ManifestObtainer.js                   |  92 -----------
 dom/manifest/ManifestObtainer.jsm                  | 170 +++++++++++++++++++++
 ...{ManifestProcessor.js => ManifestProcessor.jsm} |  18 +--
 .../{ValueExtractor.js => ValueExtractor.jsm}      |   4 +-
 dom/manifest/WebManifest.jsm                       |  19 ---
 dom/manifest/moz.build                             |  10 +-
 dom/manifest/test/browser.ini                      |   3 +-
 .../test/browser_ManifestObtainer_obtain.js        |   2 +-
 dom/manifest/test/browser_hasManifestLink.js       | 109 +++++++++++++
 dom/manifest/test/common.js                        |   4 +-
 dom/security/test/csp/browser_test_web_manifest.js |  12 +-
 .../csp/browser_test_web_manifest_mixed_content.js |  10 +-
 toolkit/modules/PromiseMessage.jsm                 |  36 +++++
 toolkit/modules/moz.build                          |   1 +
 17 files changed, 467 insertions(+), 247 deletions(-)
 rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%)
 create mode 100644 dom/manifest/ManifestFinder.jsm
 delete mode 100644 dom/manifest/ManifestObtainer.js
 create mode 100644 dom/manifest/ManifestObtainer.jsm
 rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%)
 rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%)
 delete mode 100644 dom/manifest/WebManifest.jsm
 create mode 100644 dom/manifest/test/browser_hasManifestLink.js
 create mode 100644 toolkit/modules/PromiseMessage.jsm
2015-07-08 13:26:32 +10:00

64 lines
2.2 KiB
JavaScript

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
/*
* Helper functions extract values from manifest members
* and reports conformance violations.
*/
/*globals Components*/
'use strict';
const {
classes: Cc,
interfaces: Ci
} = Components;
function ValueExtractor(aConsole) {
this.console = aConsole;
}
ValueExtractor.prototype = {
// This function takes a 'spec' object and destructures
// it to extract a value. If the value is of th wrong type, it
// warns the developer and returns undefined.
// expectType: is the type of a JS primitive (string, number, etc.)
// object: is the object from which to extract the value.
// objectName: string used to construct the developer warning.
// property: the name of the property being extracted.
// trim: boolean, if the value should be trimmed (used by string type).
extractValue({expectedType, object, objectName, property, trim}) {
const value = object[property];
const isArray = Array.isArray(value);
// We need to special-case "array", as it's not a JS primitive.
const type = (isArray) ? 'array' : typeof value;
if (type !== expectedType) {
if (type !== 'undefined') {
let msg = `Expected the ${objectName}'s ${property} `;
msg += `member to be a ${expectedType}.`;
this.console.log(msg);
}
return undefined;
}
// Trim string and returned undefined if the empty string.
const shouldTrim = expectedType === 'string' && value && trim;
if (shouldTrim) {
return value.trim() || undefined;
}
return value;
},
extractColorValue(spec) {
const value = this.extractValue(spec);
const DOMUtils = Cc['@mozilla.org/inspector/dom-utils;1']
.getService(Ci.inIDOMUtils);
let color;
if (DOMUtils.isValidCSSColor(value)) {
color = value;
} else if (value) {
const msg = `background_color: ${value} is not a valid CSS color.`;
this.console.warn(msg);
}
return color;
}
};
this.ValueExtractor = ValueExtractor; // jshint ignore:line
this.EXPORTED_SYMBOLS = ['ValueExtractor']; // jshint ignore:line