Permalink
Browse files

Merge mozilla-b2g18 to mozilla-b2g18_v1_0_1

  • Loading branch information...
2 parents ffaf605 + 70dd74b commit 31d444671f52b999b6c9d2ff8809f7a558c429b4 @rail rail committed Feb 13, 2013
Showing with 2,212 additions and 2,083 deletions.
  1. +8 −6 b2g/app/b2g.js
  2. +0 −2 b2g/chrome/content/UAO_child.js
  3. +2 −1 b2g/chrome/content/forms.js
  4. +10 −5 b2g/chrome/content/settings.js
  5. +17 −14 b2g/chrome/content/shell.js
  6. +0 −2 b2g/chrome/jar.mn
  7. +0 −6 b2g/components/Keyboard.jsm
  8. +0 −12 b2g/components/ProcessGlobal.js
  9. +2 −1 b2g/components/RecoveryService.js
  10. +2 −1 b2g/config/panda-gaia-central/config.json
  11. +2 −1 b2g/config/panda/config.json
  12. +0 −10 b2g/installer/package-manifest.in
  13. +0 −10 browser/installer/package-manifest.in
  14. +0 −1 browser/installer/removed-files.in
  15. +0 −6 configure.in
  16. +6 −6 content/base/crashtests/crashtests.list
  17. +3 −2 content/base/public/nsIFrameLoader.idl
  18. +16 −36 content/base/src/nsFrameLoader.cpp
  19. +3 −3 content/base/src/nsFrameLoader.h
  20. +1 −1 content/canvas/crashtests/crashtests.list
  21. +1 −1 content/html/content/crashtests/crashtests.list
  22. +2 −2 content/media/test/crashtests/crashtests.list
  23. +1 −1 content/svg/content/src/crashtests/crashtests.list
  24. +7 −7 content/xbl/crashtests/crashtests.list
  25. +1 −1 content/xml/content/crashtest/crashtests.list
  26. +1 −1 content/xml/document/crashtests/crashtests.list
  27. +28 −21 dom/apps/src/AppsUtils.jsm
  28. +54 −21 dom/apps/src/Webapps.jsm
  29. +1 −1 dom/base/nsContentPermissionHelper.cpp
  30. +1 −0 dom/base/nsDOMClassInfo.cpp
  31. +11 −4 dom/base/nsJSEnvironment.cpp
  32. +18 −20 dom/bluetooth/linux/BluetoothDBusService.cpp
  33. +16 −825 dom/browser-element/BrowserElementChild.js
  34. +826 −0 dom/browser-element/BrowserElementChildPreload.js
  35. +10 −3 dom/browser-element/{BrowserElementScrolling.js → BrowserElementPanning.js}
  36. +8 −12 dom/browser-element/BrowserElementParent.jsm
  37. +1 −4 dom/camera/GonkCameraHwMgr.cpp
  38. +100 −11 dom/camera/GonkNativeWindow.cpp
  39. +13 −0 dom/camera/GonkNativeWindow.h
  40. +15 −2 dom/identity/nsDOMIdentity.js
  41. +0 −2 dom/imptests/failures/editing/conformancetest/test_runtest.html.json
  42. +11 −4 dom/ipc/ProcessPriorityManager.cpp
  43. +18 −1 dom/ipc/TabChild.cpp
  44. +3 −1 dom/ipc/jar.mn
  45. +25 −7 dom/ipc/preload.js
  46. +15 −53 dom/workers/ChromeWorkerScope.cpp
  47. +33 −1 dom/workers/RuntimeService.cpp
  48. +322 −255 dom/workers/WorkerPrivate.cpp
  49. +99 −11 dom/workers/WorkerPrivate.h
  50. +19 −2 gfx/layers/ipc/AsyncPanZoomController.cpp
  51. +21 −0 hal/Hal.cpp
  52. +8 −0 hal/HalTypes.h
  53. +112 −41 hal/gonk/GonkHal.cpp
  54. +20 −1 ipc/dbus/DBusUtils.cpp
  55. +12 −0 js/src/ctypes/CTypes.cpp
  56. +6 −4 js/src/frontend/BytecodeCompiler.cpp
  57. +2 −1 js/src/frontend/BytecodeCompiler.h
  58. +25 −0 js/src/jsapi-tests/testSourcePolicy.cpp
  59. +5 −2 js/src/jsapi.cpp
  60. +2 −0 js/src/jscntxt.h
  61. +18 −0 js/src/jsfriendapi.cpp
  62. +41 −0 js/src/jsfriendapi.h
  63. +11 −11 js/src/jsscript.cpp
  64. +2 −7 js/src/jsscript.h
  65. +4 −1 js/src/jsutil.cpp
  66. +23 −23 layout/base/crashtests/crashtests.list
  67. +17 −4 layout/base/nsIPresShell.h
  68. +22 −5 layout/base/nsPresShell.cpp
  69. +1 −0 layout/base/nsPresShell.h
  70. +1 −1 layout/forms/crashtests/crashtests.list
  71. +34 −0 layout/generic/nsSubDocumentFrame.cpp
  72. +1 −0 layout/generic/nsSubDocumentFrame.h
  73. +2 −2 layout/style/crashtests/crashtests.list
  74. +1 −0 layout/style/html.css
  75. +2 −2 layout/svg/crashtests/crashtests.list
  76. +1 −1 layout/tables/crashtests/crashtests.list
  77. +0 −8 mobile/android/installer/package-manifest.in
  78. +4 −0 modules/libpref/src/init/all.js
  79. +0 −4 services/Makefile.in
  80. +0 −2 services/captivedetect/CaptivePortalDetectComponents.manifest
  81. +0 −27 services/captivedetect/Makefile.in
  82. +0 −426 services/captivedetect/captivedetect.js
  83. +0 −53 services/captivedetect/nsICaptivePortalDetector.idl
  84. +0 −9 services/captivedetect/services-captivedetect.js
  85. +0 −1 services/makefiles.sh
  86. +33 −27 testing/marionette/marionette-actors.js
  87. +20 −19 testing/marionette/marionette-listener.js
  88. +1 −1 toolkit/content/devicestorage.properties
  89. +28 −0 widget/xpwidgets/PuppetWidget.cpp
View
@@ -180,8 +180,6 @@ pref("content.sink.perf_parse_time", 50000000);
// Maximum scripts runtime before showing an alert
pref("dom.max_chrome_script_run_time", 0); // disable slow script dialog for chrome
-// Bug 817230 - disable the dialog until we implement its checkbox properly
-pref("dom.max_script_run_time", 0);
// plugins
pref("plugin.disable", true);
@@ -561,17 +559,19 @@ pref("hal.processPriorityManager.gonk.masterKillUnderMB", 1);
pref("hal.processPriorityManager.gonk.foregroundOomScoreAdjust", 67);
pref("hal.processPriorityManager.gonk.foregroundKillUnderMB", 4);
pref("hal.processPriorityManager.gonk.backgroundPerceivableOomScoreAdjust", 134);
-pref("hal.processPriorityManager.gonk.backgroundPerceivebleKillUnderMB", 5);
+pref("hal.processPriorityManager.gonk.backgroundPerceivableKillUnderMB", 5);
pref("hal.processPriorityManager.gonk.backgroundHomescreenOomScoreAdjust", 200);
pref("hal.processPriorityManager.gonk.backgroundHomescreenKillUnderMB", 5);
pref("hal.processPriorityManager.gonk.backgroundOomScoreAdjust", 400);
pref("hal.processPriorityManager.gonk.backgroundKillUnderMB", 8);
pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
// Niceness values (i.e., CPU priorities) for B2G processes.
-pref("hal.processPriorityManager.gonk.masterNice", -1);
-pref("hal.processPriorityManager.gonk.foregroundNice", 0);
-pref("hal.processPriorityManager.gonk.backgroundNice", 10);
+pref("hal.processPriorityManager.gonk.masterNice", 0);
+pref("hal.processPriorityManager.gonk.foregroundNice", 1);
+pref("hal.processPriorityManager.gonk.backgroundPerceivableNice", 10);
+pref("hal.processPriorityManager.gonk.backgroundHomescreenNice", 20);
+pref("hal.processPriorityManager.gonk.backgroundNice", 20);
#ifndef DEBUG
// Enable pre-launching content processes for improved startup time
@@ -645,3 +645,5 @@ pref("memory_info_dumper.watch_fifo.directory", "/data/local");
// <input type='file'> implementation is not complete. We have to disable the
// type to web content to help them do feature detection.
pref("dom.disable_input_file", true);
+
+pref("general.useragent.enable_overrides", true);
@@ -1,2 +0,0 @@
-Components.utils.import('resource://gre/modules/UserAgentOverrides.jsm');
-UserAgentOverrides.init();
@@ -448,7 +448,7 @@ function getJSON(element) {
value = element.textContent;
}
- // Until the input type=date/datetime/time have been implemented
+ // Until the input type=date/datetime/range have been implemented
// let's return their real type even if the platform returns 'text'
// Related to Bug 769352 - Implement <input type=date>
// Related to Bug 777279 - Implement <input type=time>
@@ -461,6 +461,7 @@ function getJSON(element) {
case "time":
case "datetime":
case "datetime-local":
+ case "range":
type = typeLowerCase;
break;
}
@@ -207,12 +207,17 @@ SettingsListener.observe('devtools.debugger.remote-enabled', false, function(val
#ifdef MOZ_WIDGET_GONK
let enableAdb = value;
- if (Services.prefs.getBoolPref('marionette.defaultPrefs.enabled')) {
- // Marionette is enabled. Force adb on, since marionette requires remote
- // debugging to be disabled (we don't want adb to track the remote debugger
- // setting).
+ try {
+ if (Services.prefs.getBoolPref('marionette.defaultPrefs.enabled')) {
+ // Marionette is enabled. Force adb on, since marionette requires remote
+ // debugging to be disabled (we don't want adb to track the remote debugger
+ // setting).
- enableAdb = true;
+ enableAdb = true;
+ }
+ } catch (e) {
+ // This means that the pref doesn't exist. Which is fine. We just leave
+ // enableAdb alone.
}
// Configure adb.
@@ -673,7 +673,7 @@ var AlertsHelper = {
return;
let topic = detail.type == "desktop-notification-click" ? "alertclickcallback"
- : "alertfinished";
+ /* desktop-notification-close */ : "alertfinished";
if (uid.startsWith("app-notif")) {
try {
listener.mm.sendAsyncMessage("app-notification-return", {
@@ -682,13 +682,17 @@ var AlertsHelper = {
target: listener.target
});
} catch(e) {
+ // we get an exception if the app is not launched yet
+
gSystemMessenger.sendMessage("notification", {
- title: listener.title,
- body: listener.text,
- imageURL: listener.imageURL
- },
- Services.io.newURI(listener.target, null, null),
- Services.io.newURI(listener.manifestURL, null, null));
+ clicked: (detail.type === "desktop-notification-click"),
+ title: listener.title,
+ body: listener.text,
+ imageURL: listener.imageURL
+ },
+ Services.io.newURI(listener.target, null, null),
+ Services.io.newURI(listener.manifestURL, null, null)
+ );
}
} else if (uid.startsWith("alert")) {
try {
@@ -1039,21 +1043,20 @@ window.addEventListener('ContentStart', function update_onContentStart() {
});
(function geolocationStatusTracker() {
- let gGeolocationActiveCount = 0;
+ let gGeolocationActive = false;
Services.obs.addObserver(function(aSubject, aTopic, aData) {
- let oldCount = gGeolocationActiveCount;
+ let oldState = gGeolocationActive;
if (aData == "starting") {
- gGeolocationActiveCount += 1;
+ gGeolocationActive = true;
} else if (aData == "shutdown") {
- gGeolocationActiveCount -= 1;
+ gGeolocationActive = false;
}
- // We need to track changes from 1 <-> 0
- if (gGeolocationActiveCount + oldCount == 1) {
+ if (gGeolocationActive != oldState) {
shell.sendChromeEvent({
type: 'geolocation-status',
- active: (gGeolocationActiveCount == 1)
+ active: gGeolocationActive
});
}
}, "geolocation-device-events", false);
View
@@ -25,8 +25,6 @@ chrome.jar:
content/payment.js (content/payment.js)
content/identity.js (content/identity.js)
- content/UAO_child.js (content/UAO_child.js)
-
% override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
% override chrome://global/skin/netError.css chrome://browser/content/netError.css
% override chrome://global/skin/media/videocontrols.css chrome://browser/content/touchcontrols.css
@@ -46,12 +46,6 @@ let Keyboard = {
let frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
let mm = frameLoader.messageManager;
mm.addMessageListener('Forms:Input', this);
-
- try {
- mm.loadFrameScript(kFormsFrameScript, true);
- } catch (e) {
- dump('Error loading ' + kFormsFrameScript + ' as frame script: ' + e + '\n');
- }
},
receiveMessage: function keyboardReceiveMessage(msg) {
@@ -43,7 +43,6 @@ ProcessGlobal.prototype = {
switch (topic) {
case 'app-startup': {
Services.obs.addObserver(this, 'console-api-log-event', false);
- Services.obs.addObserver(this, 'remote-browser-frame-shown', false);
break;
}
case 'console-api-log-event': {
@@ -57,17 +56,6 @@ ProcessGlobal.prototype = {
' '));
break;
}
- case 'remote-browser-frame-shown': {
- let frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
- let mm = frameLoader.messageManager;
-
- const kFrameScript = "chrome://browser/content/UAO_child.js";
- try {
- mm.loadFrameScript(kFrameScript, true);
- } catch (e) {
- dump('Error loading ' + kFrameScript + ' as frame script: ' + e + '\n');
- }
- }
}
},
};
@@ -19,8 +19,9 @@ function log(msg) {
#ifdef MOZ_WIDGET_GONK
let librecovery = (function() {
+ let library;
try {
- let library = ctypes.open("librecovery.so");
+ library = ctypes.open("librecovery.so");
} catch (e) {
log("Unable to open librecovery.so");
throw Cr.NS_ERROR_FAILURE;
@@ -4,9 +4,10 @@
"mock_target": "mozilla-centos6-i386",
"mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel"],
"mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
- "build_targets": ["boottarball", "systemtarball", "userdatatarball"],
+ "build_targets": ["boottarball", "systemtarball", "userdatatarball", "package-tests"],
"upload_files": [
"{workdir}/out/target/product/panda/*.tar.bz2",
+ "{workdir}/out/target/product/panda/tests/*.zip",
"{objdir}/dist/b2g-update/*.mar",
"{objdir}/dist/b2g-*.tar.gz",
"{objdir}/dist/b2g-*.crashreporter-symbols.zip",
@@ -4,9 +4,10 @@
"mock_target": "mozilla-centos6-i386",
"mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel"],
"mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
- "build_targets": ["boottarball", "systemtarball", "userdatatarball"],
+ "build_targets": ["boottarball", "systemtarball", "userdatatarball", "package-tests"],
"upload_files": [
"{workdir}/out/target/product/panda/*.tar.bz2",
+ "{workdir}/out/target/product/panda/tests/*.zip",
"{objdir}/dist/b2g-update/*.mar",
"{objdir}/dist/b2g-*.tar.gz",
"{objdir}/dist/b2g-*.crashreporter-symbols.zip",
@@ -285,9 +285,6 @@
@BINPATH@/components/services-crypto.xpt
#endif
@BINPATH@/components/services-crypto-component.xpt
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/services-captivedetect.xpt
-#endif
@BINPATH@/components/shellservice.xpt
@BINPATH@/components/shistory.xpt
@BINPATH@/components/spellchecker.xpt
@@ -492,10 +489,6 @@
@BINPATH@/components/HealthReportComponents.manifest
@BINPATH@/components/HealthReportService.js
#endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
-#endif
@BINPATH@/components/TelemetryPing.js
@BINPATH@/components/TelemetryPing.manifest
@BINPATH@/components/Webapps.js
@@ -590,9 +583,6 @@
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/@PREF_DIR@/healthreport-prefs.js
#endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/@PREF_DIR@/services-captivedetect.js
-#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
@@ -282,9 +282,6 @@
@BINPATH@/components/saxparser.xpt
@BINPATH@/components/sessionstore.xpt
@BINPATH@/components/services-crypto-component.xpt
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/services-captivedetect.xpt
-#endif
@BINPATH@/components/shellservice.xpt
@BINPATH@/components/shistory.xpt
@BINPATH@/components/spellchecker.xpt
@@ -478,10 +475,6 @@
@BINPATH@/components/SyncComponents.manifest
@BINPATH@/components/Weave.js
#endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
-#endif
@BINPATH@/components/TelemetryPing.js
@BINPATH@/components/TelemetryPing.manifest
@BINPATH@/components/messageWakeupService.js
@@ -585,9 +578,6 @@
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/@PREF_DIR@/healthreport-prefs.js
#endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/@PREF_DIR@/services-captivedetect.js
-#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
@@ -966,7 +966,6 @@ xpicleanup@BIN_SUFFIX@
defaults/pref/firefox.js
defaults/pref/firefox-l10n.js
defaults/pref/services-sync.js
- defaults/pref/services-captivedetect.js
defaults/profile/bookmarks.html
defaults/profile/chrome/userChrome-example.css
defaults/profile/chrome/userContent-example.css
View
@@ -8435,12 +8435,6 @@ if test -n "$MOZ_SERVICES_SYNC"; then
AC_DEFINE(MOZ_SERVICES_SYNC)
fi
-dnl Build Captive Portal Detector if required
-AC_SUBST(MOZ_SERVICES_CAPTIVEDETECT)
-if test -n "$MOZ_SERVICES_CAPTIVEDETECT"; then
- AC_DEFINE(MOZ_SERVICES_CAPTIVEDETECT)
-fi
-
dnl ========================================================
if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC" -o "$MOZ_DMD"; then
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
@@ -4,12 +4,12 @@ load 149320-1.html
load 205225-1.html
load 231475-1.html
load 293388-1.html
-load 308120-1.xul
+skip-if(B2G) load 308120-1.xul # bug 834382
load 324871-1.html
load 325730-1.html
load 326618-1.html
load 326646-1.html
-load 326778-1.xul
+skip-if(B2G) load 326778-1.xul # bug 834382
load 326865-1.html
load 327694.html
load 330925-1.xhtml
@@ -20,12 +20,12 @@ load 340733-1.html
load 343730-1.xhtml
load 343850-1.xhtml
load 343889-1.html
-load 344434-1.xhtml
+skip-if(B2G) load 344434-1.xhtml # bug 834382
load 348049-1.xhtml
load 344882-1.html
load 345837-1.xhtml
load 349355-1.html
-load 354645-1.xul
+skip-if(B2G) load 354645-1.xul # bug 834382
load 360599-1.html
load 366200-1.xhtml
load 369216-1.html
@@ -38,9 +38,9 @@ load 387460-1.html
load 395469-1.xhtml
load 395469-2.xhtml
skip load 399712-1.html # sporadically times out (bug 473680)
-load 398088-1.xul
+skip-if(B2G) load 398088-1.xul # bug 834382
load 400763-1.html
-load 401993-1.html
+skip-if(B2G) load 401993-1.html # bug 834382
load 407818.html
load 410860-1.xml
load 411882-1.xhtml
@@ -8,6 +8,7 @@
interface nsIDocShell;
interface nsIURI;
interface nsIFrame;
+interface nsSubDocumentFrame;
interface nsIMessageSender;
interface nsIVariant;
interface nsIDOMElement;
@@ -108,7 +109,7 @@ interface nsIContentViewManager : nsISupports
readonly attribute nsIContentView rootContentView;
};
-[scriptable, uuid(f234c232-bb17-4450-b324-bf1ef5ccfd34)]
+[scriptable, uuid(a4db652e-e3b0-4345-8107-cf6a30486759)]
interface nsIFrameLoader : nsISupports
{
/**
@@ -146,7 +147,7 @@ interface nsIFrameLoader : nsISupports
*
* @param aIFrame The nsIFrame for the content node that owns this frameloader
*/
- [noscript] void updatePositionAndSize(in nsIFrame aIFrame);
+ [noscript] void updatePositionAndSize(in nsSubDocumentFrame aIFrame);
/**
* Activate remote frame.
Oops, something went wrong.

0 comments on commit 31d4446

Please sign in to comment.