From 7555f62438d964f81b23254ec30fa914964ea33c Mon Sep 17 00:00:00 2001 From: Andreas Gal Date: Sun, 19 Feb 2012 18:07:43 +0100 Subject: [PATCH 1/4] Use native httpd instead of httpd.js (bug 728695, r=cjones). --- b2g/chrome/content/shell.js | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index 1ddb0a18811..2d707a5aadd 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -37,21 +37,6 @@ XPCOMUtils.defineLazyServiceGetter(Services, 'fm', function(){ .getService(Ci.nsFocusManager); }); - -// In order to use http:// scheme instead of file:// scheme -// (that is much more restricted) the following code kick-off -// a local http server listening on http://127.0.0.1:7777 and -// http://localhost:7777. -function startupHttpd(baseDir, port) { - const httpdURL = 'chrome://browser/content/httpd.js'; - let httpd = {}; - Services.scriptloader.loadSubScript(httpdURL, httpd); - let server = new httpd.nsHttpServer(); - server.registerDirectory('/', new LocalFile(baseDir)); - server.registerContentType('appcache', 'text/cache-manifest'); - server.start(port); -} - // FIXME Bug 707625 // until we have a proper security model, add some rights to // the pre-installed web applications @@ -70,7 +55,6 @@ function addPermissions(urls) { }); } - var shell = { // FIXME/bug 678695: this should be a system setting preferredScreenBrightness: 1.0, @@ -121,17 +105,7 @@ var shell = { let fileScheme = 'file://'; if (homeURL.substring(0, fileScheme.length) == fileScheme) { - homeURL = homeURL.replace(fileScheme, ''); - - let baseDir = homeURL.split('/'); - baseDir.pop(); - baseDir = baseDir.join('/'); - - const SERVER_PORT = 6666; - startupHttpd(baseDir, SERVER_PORT); - - let baseHost = 'http://localhost'; - homeURL = homeURL.replace(baseDir, baseHost + ':' + SERVER_PORT); + homeURL = 'http://localhost:7777' + homeURL.replace(fileScheme, ''); } addPermissions([homeURL]); } catch (e) { @@ -139,12 +113,12 @@ var shell = { return alert(msg); } - // Load webapi+apps.js as a frame script + // Load webapi.js as a frame script let frameScriptUrl = 'chrome://browser/content/webapi.js'; try { messageManager.loadFrameScript(frameScriptUrl, true); } catch (e) { - dump('Error when loading ' + frameScriptUrl + ' as a frame script: ' + e + '\n'); + dump('Error loading ' + frameScriptUrl + ' as a frame script: ' + e + '\n'); } let browser = this.contentBrowser; From 3b557f3661f0088e90aff30a8b327fc1f9d5c030 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sun, 19 Feb 2012 09:47:16 -0800 Subject: [PATCH 2/4] Bug 728673: Restore call to getNumberOfCameras(). r=fabrice --- netwerk/protocol/device/GonkCaptureProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/protocol/device/GonkCaptureProvider.cpp b/netwerk/protocol/device/GonkCaptureProvider.cpp index fe24536a60f..b589f1b1bc5 100644 --- a/netwerk/protocol/device/GonkCaptureProvider.cpp +++ b/netwerk/protocol/device/GonkCaptureProvider.cpp @@ -275,7 +275,7 @@ GonkCameraInputStream::Init(nsACString& aContentType, nsCaptureParams* aParams) mHeight = aParams->height; mCamera = aParams->camera; - PRUint32 maxNumCameras = 2;//getNumberOfCameras(); + PRUint32 maxNumCameras = getNumberOfCameras(); if (maxNumCameras == 0) return NS_ERROR_FAILURE; From 21bbe4cd7b33217a1564d00c343116b60d0a2cad Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Sun, 19 Feb 2012 20:36:06 +0200 Subject: [PATCH 3/4] Bug 728547 - Increase the forgetSkippable timer value, r=mccr8 --- dom/base/nsJSEnvironment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 7e8fa870fcc..dae9a4c9372 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -140,9 +140,9 @@ static PRLogModuleInfo* gJSDiagnostics; // The amount of time we wait between a request to CC (after GC ran) // and doing the actual CC. -#define NS_CC_DELAY 5000 // ms +#define NS_CC_DELAY 6000 // ms -#define NS_CC_SKIPPABLE_DELAY 250 // ms +#define NS_CC_SKIPPABLE_DELAY 400 // ms #define NS_CC_FORCED (5 * 60 * PR_USEC_PER_SEC) // 5 min From 2f37c0d28a69427ff726b1779db8d63563d8ce40 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Mon, 20 Feb 2012 05:25:17 +0100 Subject: [PATCH 4/4] Bug 718237. (Bv2) test_focus_autocomplete.xul: Skip this test on SeaMonkey ftb. r=surkov.alexander. --- accessible/tests/mochitest/common.js | 15 +++++++++++---- .../mochitest/events/test_focus_autocomplete.xul | 6 ++++++ .../tests/mochitest/tree/test_tabbrowser.xul | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js index 51676067426..d17b8c1721d 100644 --- a/accessible/tests/mochitest/common.js +++ b/accessible/tests/mochitest/common.js @@ -52,10 +52,17 @@ const nsIPropertyElement = Components.interfaces.nsIPropertyElement; //////////////////////////////////////////////////////////////////////////////// // OS detect -const MAC = (navigator.platform.indexOf("Mac") != -1)? true : false; -const LINUX = (navigator.platform.indexOf("Linux") != -1)? true : false; -const SOLARIS = (navigator.platform.indexOf("SunOS") != -1)? true : false; -const WIN = (navigator.platform.indexOf("Win") != -1)? true : false; + +const MAC = (navigator.platform.indexOf("Mac") != -1); +const LINUX = (navigator.platform.indexOf("Linux") != -1); +const SOLARIS = (navigator.platform.indexOf("SunOS") != -1); +const WIN = (navigator.platform.indexOf("Win") != -1); + +//////////////////////////////////////////////////////////////////////////////// +// Application detect +// Firefox is assumed by default. + +const SEAMONKEY = navigator.userAgent.match(/ SeaMonkey\//); //////////////////////////////////////////////////////////////////////////////// // Accessible general diff --git a/accessible/tests/mochitest/events/test_focus_autocomplete.xul b/accessible/tests/mochitest/events/test_focus_autocomplete.xul index d6ca72882b6..280893e76f7 100644 --- a/accessible/tests/mochitest/events/test_focus_autocomplete.xul +++ b/accessible/tests/mochitest/events/test_focus_autocomplete.xul @@ -382,6 +382,12 @@ var gInitQueue = null; function initTests() { + if (SEAMONKEY) { + todo(false, "Skipping this test on SeaMonkey ftb. (Bug 718237)"); + SimpleTest.finish(); + return; + } + // register 'test-a11y-search' autocomplete search initAutoComplete([ "hello", "hi" ], [ "Beep beep'm beep beep yeah", "Baby you can drive my car" ]); diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xul b/accessible/tests/mochitest/tree/test_tabbrowser.xul index 82d2b55485a..38386628b61 100644 --- a/accessible/tests/mochitest/tree/test_tabbrowser.xul +++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul @@ -52,7 +52,7 @@ }; // SeaMonkey and Firefox tabbrowser UIs differ. - if ("restoreTab" in tabBrowser) { + if (SEAMONKEY) { SimpleTest.ok(true, "Testing SeaMonkey tabbrowser UI."); tabsAccTree.children.splice(0, 0,