Bug 1264813 - Remove image object's density member from Web Manifest processor. r=mconley

This commit is contained in:
Marcos Caceres 2016-04-14 17:26:00 +02:00
Родитель eae4a312af
Коммит 27a66d7020
4 изменённых файлов: 0 добавлений и 70 удалений

Просмотреть файл

@ -75,7 +75,6 @@ ImageObjectProcessor.prototype.process = function(
'src': processSrcMember(aImageSpec, aBaseURL),
'type': processTypeMember(aImageSpec),
'sizes': processSizesMember(aImageSpec),
'density': processDensityMember(aImageSpec),
'background_color': processBackgroundColorMember(aImageSpec)
};
}
@ -97,13 +96,6 @@ ImageObjectProcessor.prototype.process = function(
return value || undefined;
}
function processDensityMember(aImage) {
const value = parseFloat(aImage.density);
const validNum = Number.isNaN(value) || value === +Infinity || value <=
0;
return (validNum) ? 1.0 : value;
}
function processSrcMember(aImage, aBaseURL) {
const spec = {
objectName: 'image',

Просмотреть файл

@ -4,7 +4,6 @@ support-files =
resource.sjs
manifestLoader.html
[test_ImageObjectProcessor_background_color.html]
[test_ImageObjectProcessor_density.html]
[test_ImageObjectProcessor_sizes.html]
[test_ImageObjectProcessor_src.html]
[test_ImageObjectProcessor_type.html]

Просмотреть файл

@ -1,57 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1079453
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1079453</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script src="common.js"></script>
<script>
/**
* Image object density member
* https://w3c.github.io/manifest/#density-member
**/
'use strict';
var testIcon = {
icons: [{
src: 'test',
density: undefined
}]
};
var iconDensityValueTests = [null, {},
[], false, '', -0, '-0', -1.0000, -123131132, -1.2e+200,
'Infinity', '-Infinity',
'-1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
'1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
];
iconDensityValueTests.forEach((density) => {
var expected = `Expect density to default to 1.0.`;
testIcon.icons[0].density = density;
data.jsonText = JSON.stringify(testIcon);
var result = processor.process(data);
is(result.icons[0].density, 1.0, expected);
});
testIcon = {
icons: [{
src: 'test',
density: undefined
}]
};
var parseFloatTests = [3.14, '3.14', `${whiteSpace}3.14${whiteSpace}`, 12e300];
parseFloatTests.forEach((testNumber) => {
var expected = `Expect density to be ${parseFloat(testNumber)}.`;
testIcon.icons[0].density = testNumber;
data.jsonText = JSON.stringify(testIcon);
var result = processor.process(data);
is(result.icons[0].density, parseFloat(testNumber), expected);
});
</script>
</head>

Просмотреть файл

@ -22,14 +22,11 @@ var noSrc = {
src: {}
}, {
src: null
}, {
density: '1'
}, {
type: 'image/jpg'
}, {
sizes: '1x1,2x2'
}, {
density: '1',
sizes: 'any',
type: 'image/jpg'
}]
@ -77,7 +74,6 @@ var withSrc = {
src: 'pass'
}, {
src: 'pass',
density: 1
}, {}, {
foo: 'foo'
}]