Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 911346 - Strip trailing whitespace from new files. r=me

Browse Source
This commit is contained in:
Jeff Gilbert 2013-09-19 15:42:45 -07:00
parent cf1277a469
commit 265289963c
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/canvas/test/webgl/non-conf-tests/driver-info.js
View File

@ -1,7 +1,7 @@
DriverInfo = (function() {
// ---------------------------------------------------------------------------
// Debug info handling
function defaultInfoFunc(str) {
console.log('Info: ' + str);
}
@ -14,7 +14,7 @@ DriverInfo = (function() {
function info(str) {
gInfoFunc(str);
}
// ---------------------------------------------------------------------------
// OS and driver identification
// Stolen from content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@ -37,19 +37,19 @@ DriverInfo = (function() {
}
var ext = gl.getExtension("WEBGL_debug_renderer_info");
// this extension is unconditionally available to chrome. No need to check.
var webglRenderer = gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
var webglVendor = gl.getParameter(ext.UNMASKED_VENDOR_WEBGL);
return [webglVendor, webglRenderer];
}
var OS = {
WINDOWS: 'windows',
MAC: 'mac',
LINUX: 'linux',
ANDROID: 'android',
};
var DRIVER = {
MESA: 'mesa',
NVIDIA: 'nvidia',
@ -62,33 +62,33 @@ DriverInfo = (function() {
if (navigator.platform.indexOf('Win') == 0) {
kOS = OS.WINDOWS;
// code borrowed from browser/modules/test/browser_taskbar_preview.js
var version = SpecialPowers.Services.sysinfo.getProperty('version');
kOSVersion = parseFloat(version);
// Version 6.0 is Vista, 6.1 is 7.
} else if (navigator.platform.indexOf('Mac') == 0) {
kOS = OS.MAC;
var versionMatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
kOSVersion = versionMatch ? parseFloat(versionMatch[1]) : null;
} else if (navigator.appVersion.indexOf('Android') != -1) {
kOS = OS.ANDROID;
// From layout/tools/reftest/reftest.js:
kOSVersion = SpecialPowers.Services.sysinfo.getProperty('version');
} else if (navigator.platform.indexOf('Linux') == 0) {
// Must be checked after android, as android also has a 'Linux' platform string.
kOS = OS.LINUX;
}
var glVendor, glRenderer;
[glVendor, glRenderer] = detectDriverInfo();
info('GL vendor: ' + glVendor);
info('GL renderer: ' + glRenderer);
if (glRenderer.contains('llvmpipe')) {
kDriver = DRIVER.MESA;
} else if (glRenderer.contains('Android Emulator')) {
@ -96,7 +96,7 @@ DriverInfo = (function() {
} else if (glVendor.contains('NVIDIA')) {
kDriver = DRIVER.NVIDIA;
}
if (kOS) {
info('OS detected as: ' + kOS);
info(' Version: ' + kOSVersion);
@ -111,10 +111,10 @@ DriverInfo = (function() {
} else {
info('GL driver not detected.');
}
return {
setInfoFunc: setInfoFunc,
OS: OS,
DRIVER: DRIVER,
getOS: function() { return kOS; },
@ -122,4 +122,4 @@ DriverInfo = (function() {
getOSVersion: function() { return kOSVersion; },
};
})();

18
content/canvas/test/webgl/non-conf-tests/webgl-util.js
View File

@ -1,7 +1,7 @@
WebGLUtil = (function() {
// ---------------------------------------------------------------------------
// Error handling
function defaultErrorFunc(str) {
console.log('Error: ' + str);
}
@ -14,7 +14,7 @@ WebGLUtil = (function() {
function error(str) {
gErrorFunc(str);
}
// ---------------------------------------------------------------------------
// WebGL helpers
@ -41,7 +41,7 @@ WebGLUtil = (function() {
return gl;
}
function getContentFromElem(elem) {
var str = "";
var k = elem.firstChild;
@ -51,10 +51,10 @@ WebGLUtil = (function() {
k = k.nextSibling;
}
return str;
}
// Returns a valid shader, or null on errors.
function createShaderById(gl, id) {
var elem = document.getElementById(id);
@ -80,13 +80,13 @@ WebGLUtil = (function() {
return shader;
}
function createProgramByIds(gl, vsId, fsId) {
var vs = createShaderById(gl, vsId);
var fs = createShaderById(gl, fsId);
if (!vs || !fs)
return null;
var prog = gl.createProgram();
gl.attachShader(prog, vs);
gl.attachShader(prog, fs);
@ -100,13 +100,13 @@ WebGLUtil = (function() {
error(str);
return null;
}
return prog;
}
return {
setErrorFunc: setErrorFunc,
getWebGL: getWebGL,
createShaderById: createShaderById,
createProgramByIds: createProgramByIds,