зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to fx-team.
This commit is contained in:
Ryan VanderMeulen
Коммит
16e374bd24
|
|
@ -20,8 +20,6 @@ XPCOMUtils.defineLazyModuleGetter(this, 'Utils',
|
|||
'resource://gre/modules/accessibility/Utils.jsm');
|
||||
XPCOMUtils.defineLazyModuleGetter(this, 'EventManager',
|
||||
'resource://gre/modules/accessibility/EventManager.jsm');
|
||||
XPCOMUtils.defineLazyModuleGetter(this, 'ObjectWrapper',
|
||||
'resource://gre/modules/ObjectWrapper.jsm');
|
||||
XPCOMUtils.defineLazyModuleGetter(this, 'Roles',
|
||||
'resource://gre/modules/accessibility/Constants.jsm');
|
||||
|
||||
|
|
|
|||
|
|
@ -47,8 +47,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
|
|||
"nsIUUIDGenerator");
|
||||
|
||||
#ifdef MOZ_B2G_RIL
|
||||
Cu.import('resource://gre/modules/ObjectWrapper.jsm');
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "gRil",
|
||||
"@mozilla.org/ril;1",
|
||||
"nsIRadioInterfaceLayer");
|
||||
|
|
@ -332,7 +330,7 @@ let PaymentProvider = {
|
|||
}
|
||||
}
|
||||
|
||||
return ObjectWrapper.wrap(this._iccInfo, content);
|
||||
return Cu.cloneInto(this._iccInfo, content);
|
||||
},
|
||||
|
||||
_silentNumbers: null,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ Cu.import('resource://gre/modules/DataStoreChangeNotifier.jsm');
|
|||
Cu.import('resource://gre/modules/AlarmService.jsm');
|
||||
Cu.import('resource://gre/modules/ActivitiesService.jsm');
|
||||
Cu.import('resource://gre/modules/PermissionPromptHelper.jsm');
|
||||
Cu.import('resource://gre/modules/ObjectWrapper.jsm');
|
||||
Cu.import('resource://gre/modules/NotificationDB.jsm');
|
||||
Cu.import('resource://gre/modules/Payment.jsm');
|
||||
Cu.import("resource://gre/modules/AppsUtils.jsm");
|
||||
|
|
@ -550,7 +549,7 @@ var shell = {
|
|||
sendCustomEvent: function shell_sendCustomEvent(type, details) {
|
||||
let content = getContentWindow();
|
||||
let event = content.document.createEvent('CustomEvent');
|
||||
let payload = details ? ObjectWrapper.wrap(details, content) : {};
|
||||
let payload = details ? Cu.cloneInto(details, content) : {};
|
||||
event.initCustomEvent(type, true, true, payload);
|
||||
content.dispatchEvent(event);
|
||||
},
|
||||
|
|
@ -566,7 +565,7 @@ var shell = {
|
|||
}
|
||||
|
||||
this.sendEvent(getContentWindow(), "mozChromeEvent",
|
||||
ObjectWrapper.wrap(details, getContentWindow()));
|
||||
Cu.cloneInto(details, getContentWindow()));
|
||||
},
|
||||
|
||||
openAppForSystemMessage: function shell_openAppForSystemMessage(msg) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
|
|||
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/FxAccountsCommon.js");
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "FxAccountsManager",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ const { interfaces: Ci, utils: Cu } = Components;
|
|||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/Promise.jsm");
|
||||
Cu.import("resource://gre/modules/FxAccountsCommon.js");
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
<project name="platform/external/iproute2" path="external/iproute2" revision="c66c5716d5335e450f7a7b71ccc6a604fb2f41d2"/>
|
||||
<project name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="d2685281e2e54ca14d1df304867aa82c37b27162"/>
|
||||
<project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="627f9b20fc518937b93747a7ff1ed4f5ed46e06f"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="a3daa50e9b5db558696951ae724f913e4e5c7489"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="c16df012d9649be75d6590f93aeacbdc24b29d53"/>
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="11663426672fcc46e2a0f29239afa736b90635ba"/>
|
||||
<project name="android-sdk" path="sdk" remote="b2g" revision="5701d3cb45c2e848cc57003cda2e1141288ecae4"/>
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
<project name="platform/external/iproute2" path="external/iproute2" revision="c66c5716d5335e450f7a7b71ccc6a604fb2f41d2"/>
|
||||
<project name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="d2685281e2e54ca14d1df304867aa82c37b27162"/>
|
||||
<project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="627f9b20fc518937b93747a7ff1ed4f5ed46e06f"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="a3daa50e9b5db558696951ae724f913e4e5c7489"/>
|
||||
<project name="platform/prebuilts/tools" path="prebuilts/tools" revision="c16df012d9649be75d6590f93aeacbdc24b29d53"/>
|
||||
<project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="11663426672fcc46e2a0f29239afa736b90635ba"/>
|
||||
<project name="android-sdk" path="sdk" remote="b2g" revision="5701d3cb45c2e848cc57003cda2e1141288ecae4"/>
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"revision": "56cedb487649ecd17173482c4ffe87d1bc298d86",
|
||||
"revision": "3f66811d103f803b94ec2c7127356ff3283073cd",
|
||||
"repo_path": "/integration/gaia-central"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ba8b7bf62f871fff4b6a844504c969860c6889b7"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ MOZ_PLACES=
|
|||
MOZ_B2G=1
|
||||
|
||||
if test "$OS_TARGET" = "Android"; then
|
||||
MOZ_NUWA_PROCESS=1
|
||||
MOZ_NUWA_PROCESS=
|
||||
fi
|
||||
MOZ_FOLD_LIBS=1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1390521109000">
|
||||
<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1391123284000">
|
||||
<emItems>
|
||||
<emItem blockID="i454" id="sqlmoz@facebook.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -377,6 +377,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i356" id="{341f4dac-1966-47ff-aacf-0ce175f1498a}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}">
|
||||
<versionRange minVersion="0" maxVersion="15.0.5" severity="1">
|
||||
|
|
@ -389,6 +395,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i543" id="{badea1ae-72ed-4f6a-8c37-4db9a4ac7bc9}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i447" id="{B18B1E5C-4D81-11E1-9C00-AFEB4824019B}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
|
|
@ -420,8 +432,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i466" id="afext@anchorfree.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
<emItem blockID="i258" id="helperbar@helperbar.com">
|
||||
<versionRange minVersion="0" maxVersion="1.0" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -438,11 +450,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i46" id="{841468a1-d7f4-4bd3-84e6-bb0f13a06c64}">
|
||||
<versionRange minVersion="0.1" maxVersion="*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="9.0a1" maxVersion="9.0" />
|
||||
</targetApplication>
|
||||
<emItem blockID="i549" id="/^firefox@(albrechto|swiftbrowse|springsmart|storimbo|squirrelweb|betterbrowse|lizardlink|rolimno|browsebeyond|clingclang|weblayers|kasimos|higher-aurum|xaven|bomlabio)\.(com?|net|org|info|biz)$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -595,8 +604,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i258" id="helperbar@helperbar.com">
|
||||
<versionRange minVersion="0" maxVersion="1.0" severity="1">
|
||||
<emItem blockID="i466" id="afext@anchorfree.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -692,6 +701,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i548" id="/^firefox@(jumpflip|webconnect|browsesmart|mybuzzsearch|outobox|greygray|lemurleap|divapton|secretsauce|batbrowse|whilokii|linkswift|qualitink|browsefox|kozaka|diamondata|glindorus|saltarsmart|bizzybolt|websparkle)\.(com?|net|org|info|biz)$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i79" id="GifBlock@facebook.com">
|
||||
<versionRange minVersion="0" maxVersion="*">
|
||||
|
|
@ -732,6 +747,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i507" id="4zffxtbr-bs@VideoDownloadConverter_4z.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -760,6 +781,20 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i38" id="{B7082FAA-CB62-4872-9106-E42DD88EDE45}">
|
||||
<versionRange minVersion="0.1" maxVersion="3.3.0.*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="3.7a1" maxVersion="*" />
|
||||
</targetApplication>
|
||||
</versionRange>
|
||||
<versionRange minVersion="3.3.1" maxVersion="*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="5.0a1" maxVersion="*" />
|
||||
</targetApplication>
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i471" id="firefox@luckyleap.net">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -875,8 +910,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
<emItem blockID="i542" id="/^({bf67a47c-ea97-4caf-a5e3-feeba5331231}|{24a0cfe1-f479-4b19-b627-a96bf1ea3a56})$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -935,7 +970,7 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i76" id="crossriderapp3924@crossrider.com">
|
||||
<emItem blockID="i68" id="flashupdate@adobe.com">
|
||||
<versionRange minVersion="0" maxVersion="*">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
|
|
@ -985,16 +1020,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i38" id="{B7082FAA-CB62-4872-9106-E42DD88EDE45}">
|
||||
<versionRange minVersion="0.1" maxVersion="3.3.0.*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="3.7a1" maxVersion="*" />
|
||||
</targetApplication>
|
||||
</versionRange>
|
||||
<versionRange minVersion="3.3.1" maxVersion="*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="5.0a1" maxVersion="*" />
|
||||
</targetApplication>
|
||||
<emItem blockID="i547" id="{87934c42-161d-45bc-8cef-ef18abe2a30c}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -1010,12 +1037,24 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i538" id="{354dbb0a-71d5-4e9f-9c02-6c88b9d387ba}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i451" id="{e44a1809-4d10-4ab8-b343-3326b64c7cdd}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i216" id="fdm_ffext@freedownloadmanager.org">
|
||||
<versionRange minVersion="1.0" maxVersion="1.3.1">
|
||||
|
|
@ -1101,8 +1140,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i476" id="mbroctone@facebook.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
<emItem blockID="i539" id="ScorpionSaver@jetpack">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -1142,6 +1181,15 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i46" id="{841468a1-d7f4-4bd3-84e6-bb0f13a06c64}">
|
||||
<versionRange minVersion="0.1" maxVersion="*">
|
||||
<targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
|
||||
<versionRange minVersion="9.0a1" maxVersion="9.0" />
|
||||
</targetApplication>
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i505" id="extacylife@a.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -1205,6 +1253,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i545" id="superlrcs@svenyor.net">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i324" id="/^((34qEOefiyYtRJT@IM5Munavn\.com)|(Mro5Fm1Qgrmq7B@ByrE69VQfZvZdeg\.com)|(KtoY3KGxrCe5ie@yITPUzbBtsHWeCdPmGe\.com)|(9NgIdLK5Dq4ZMwmRo6zk@FNt2GCCLGyUuOD\.com)|(NNux7bWWW@RBWyXdnl6VGls3WAwi\.com)|(E3wI2n@PEHTuuNVu\.com)|(2d3VuWrG6JHBXbQdbr@3BmSnQL\.com))$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -1289,6 +1343,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
|
|
@ -1322,8 +1382,8 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i356" id="{341f4dac-1966-47ff-aacf-0ce175f1498a}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
<emItem blockID="i476" id="mbroctone@facebook.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
|
|
@ -1357,6 +1417,12 @@
|
|||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i546" id="firefox@browsefox.com">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="1">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i510" id="{3c9a72a0-b849-40f3-8c84-219109c27554}">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
|
|
@ -1403,7 +1469,13 @@
|
|||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i68" id="flashupdate@adobe.com">
|
||||
<emItem blockID="i541" id="/^({988919ff-0cd8-4d0c-bc7e-60d55a49eb64}|{494b9726-9084-415c-a499-68c07e187244}|{55b95864-3251-45e9-bb30-1a82589aaff1}|{eef3855c-fc2d-41e6-8d91-d368f51b3055}|{90a1b331-c2b4-4933-9f63-ba7b84d60d58}|{d2cf9842-af95-48cd-b873-bfbb48cd7f5e})$/">
|
||||
<versionRange minVersion="0" maxVersion="*" severity="3">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
</prefs>
|
||||
</emItem>
|
||||
<emItem blockID="i76" id="crossriderapp3924@crossrider.com">
|
||||
<versionRange minVersion="0" maxVersion="*">
|
||||
</versionRange>
|
||||
<prefs>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
frame1.docShell.chromeEventHandler.removeAttribute("crashedPageTitle");
|
||||
|
||||
SimpleTest.is(frame1.contentDocument.documentURI,
|
||||
"about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/1&c=UTF-8&d=pageTitle",
|
||||
"about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/1&c=UTF-8&d=pageTitle&f=regular",
|
||||
"Correct about:tabcrashed displayed for page with title.");
|
||||
|
||||
errorPageReady = waitForErrorPage(frame2);
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
yield errorPageReady;
|
||||
|
||||
SimpleTest.is(frame2.contentDocument.documentURI,
|
||||
"about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/2&c=UTF-8&d=%20",
|
||||
"about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/2&c=UTF-8&d=%20&f=regular",
|
||||
"Correct about:tabcrashed displayed for page with no title.");
|
||||
|
||||
SimpleTest.finish();
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ public:
|
|||
}
|
||||
|
||||
bool RequestMet() { return mRequestMet; }
|
||||
void SetRequestMet();
|
||||
long RefCount() { return mRef; }
|
||||
void HeartBeat();
|
||||
|
||||
|
|
@ -386,8 +387,6 @@ public:
|
|||
private:
|
||||
~CExecuteCommandVerb()
|
||||
{
|
||||
SafeRelease(&mShellItemArray);
|
||||
SafeRelease(&mUnkSite);
|
||||
}
|
||||
|
||||
void LaunchDesktopBrowser();
|
||||
|
|
@ -665,12 +664,12 @@ CExecuteCommandVerb::HeartBeat()
|
|||
!IsMetroProcessRunning()) {
|
||||
mDelayedLaunchType = NONE;
|
||||
LaunchDesktopBrowser();
|
||||
mRequestMet = true;
|
||||
SetRequestMet();
|
||||
}
|
||||
if (mDelayedLaunchType == METRO && !TestForUpdateLock()) {
|
||||
mDelayedLaunchType = NONE;
|
||||
LaunchMetroBrowser();
|
||||
mRequestMet = true;
|
||||
SetRequestMet();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -748,15 +747,13 @@ CExecuteCommandVerb::LaunchMetroBrowser()
|
|||
return true;
|
||||
}
|
||||
|
||||
class AutoSetRequestMet
|
||||
void CExecuteCommandVerb::SetRequestMet()
|
||||
{
|
||||
public:
|
||||
explicit AutoSetRequestMet(bool* aFlag) :
|
||||
mFlag(aFlag) {}
|
||||
~AutoSetRequestMet() { if (mFlag) *mFlag = true; }
|
||||
private:
|
||||
bool* mFlag;
|
||||
};
|
||||
SafeRelease(&mShellItemArray);
|
||||
SafeRelease(&mUnkSite);
|
||||
mRequestMet = true;
|
||||
Log(L"Request met, exiting.");
|
||||
}
|
||||
|
||||
IFACEMETHODIMP CExecuteCommandVerb::Execute()
|
||||
{
|
||||
|
|
@ -764,7 +761,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
|
|||
|
||||
if (!mTarget.GetLength()) {
|
||||
// We shut down when this flips to true
|
||||
mRequestMet = true;
|
||||
SetRequestMet();
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
|
|
@ -784,7 +781,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
|
|||
if (mRequestType == DESKTOP_RESTART ||
|
||||
(mRequestType == DEFAULT_LAUNCH && DefaultLaunchIsDesktop())) {
|
||||
LaunchDesktopBrowser();
|
||||
mRequestMet = true;
|
||||
SetRequestMet();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
@ -796,7 +793,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
|
|||
}
|
||||
|
||||
LaunchMetroBrowser();
|
||||
mRequestMet = true;
|
||||
SetRequestMet();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ namespace mozilla {
|
|||
// January 1, 1970.
|
||||
#define iso_time_offset 2082844800
|
||||
|
||||
const static uint32_t MUXING_BUFFER_SIZE = 512*1024;
|
||||
|
||||
FragmentBuffer::FragmentBuffer(uint32_t aTrackType, uint32_t aFragDuration,
|
||||
TrackMetadataBase* aMetadata)
|
||||
: mTrackType(aTrackType)
|
||||
|
|
@ -140,7 +138,8 @@ ISOControl::ISOControl()
|
|||
, mBitCount(0)
|
||||
, mBit(0)
|
||||
{
|
||||
mOutBuffer.SetCapacity(MUXING_BUFFER_SIZE);
|
||||
// Create a data array for first mp4 Box, ftyp.
|
||||
mOutBuffers.SetLength(1);
|
||||
MOZ_COUNT_CTOR(ISOControl);
|
||||
}
|
||||
|
||||
|
|
@ -250,21 +249,47 @@ ISOControl::GetFragment(uint32_t aType)
|
|||
}
|
||||
|
||||
nsresult
|
||||
ISOControl::GetBuf(nsTArray<uint8_t>& aOutBuf)
|
||||
ISOControl::GetBufs(nsTArray<nsTArray<uint8_t>>* aOutputBufs)
|
||||
{
|
||||
mOutputSize += mOutBuffer.Length();
|
||||
aOutBuf.SwapElements(mOutBuffer);
|
||||
uint32_t len = mOutBuffers.Length();
|
||||
for (uint32_t i = 0; i < len; i++) {
|
||||
mOutBuffers[i].SwapElements(*aOutputBufs->AppendElement());
|
||||
mOutputSize += mOutBuffers[i].Length();
|
||||
}
|
||||
return FlushBuf();
|
||||
}
|
||||
|
||||
nsresult
|
||||
ISOControl::FlushBuf()
|
||||
{
|
||||
mOutBuffer.SetCapacity(MUXING_BUFFER_SIZE);
|
||||
mOutBuffers.SetLength(1);
|
||||
mLastWrittenBoxPos = 0;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
ISOControl::WriteAVData(nsTArray<uint8_t>& aArray)
|
||||
{
|
||||
MOZ_ASSERT(!mBitCount);
|
||||
|
||||
uint32_t len = aArray.Length();
|
||||
if (!len) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// The last element already has data, allocated a new element for pointer
|
||||
// swapping.
|
||||
if (mOutBuffers.LastElement().Length()) {
|
||||
mOutBuffers.AppendElement();
|
||||
}
|
||||
// Swap the video/audio data pointer.
|
||||
mOutBuffers.LastElement().SwapElements(aArray);
|
||||
// Following data could be boxes, so appending a new uint8_t array here.
|
||||
mOutBuffers.AppendElement();
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
ISOControl::WriteBits(uint64_t aBits, size_t aNumBits)
|
||||
{
|
||||
|
|
@ -287,7 +312,7 @@ ISOControl::WriteBits(uint64_t aBits, size_t aNumBits)
|
|||
uint32_t
|
||||
ISOControl::Write(uint8_t* aBuf, uint32_t aSize)
|
||||
{
|
||||
mOutBuffer.AppendElements(aBuf, aSize);
|
||||
mOutBuffers.LastElement().AppendElements(aBuf, aSize);
|
||||
return aSize;
|
||||
}
|
||||
|
||||
|
|
@ -299,6 +324,17 @@ ISOControl::Write(uint8_t aData)
|
|||
return sizeof(uint8_t);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
ISOControl::GetBufPos()
|
||||
{
|
||||
uint32_t len = mOutBuffers.Length();
|
||||
uint32_t pos = 0;
|
||||
for (uint32_t i = 0; i < len; i++) {
|
||||
pos += mOutBuffers.ElementAt(i).Length();
|
||||
}
|
||||
return pos;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
ISOControl::WriteFourCC(const char* aType)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
#define ISOCOMPOSITOR_H_
|
||||
|
||||
#include "mozilla/Endian.h"
|
||||
#include "TrackMetadataBase.h"
|
||||
#include "nsTArray.h"
|
||||
#include "ISOTrackMetadata.h"
|
||||
#include "EncodedFrameContainer.h"
|
||||
|
|
@ -130,6 +129,9 @@ public:
|
|||
nsresult GenerateMoov();
|
||||
nsresult GenerateMoof(uint32_t aTrackType);
|
||||
|
||||
// Swap elementary stream pointer to output buffers.
|
||||
uint32_t WriteAVData(nsTArray<uint8_t>& aArray);
|
||||
|
||||
uint32_t Write(uint8_t* aBuf, uint32_t aSize);
|
||||
|
||||
uint32_t Write(uint8_t aData);
|
||||
|
|
@ -160,8 +162,8 @@ public:
|
|||
// others non-bit writing function.
|
||||
uint32_t WriteBits(uint64_t aBits, size_t aNumBits);
|
||||
|
||||
// This is called by GetContainerData and swap the buffer to aOutBuf.
|
||||
nsresult GetBuf(nsTArray<uint8_t>& aOutBuf);
|
||||
// This is called by GetContainerData and swap all the buffers to aOutputBuffers.
|
||||
nsresult GetBufs(nsTArray<nsTArray<uint8_t>>* aOutputBufs);
|
||||
|
||||
// Presentation time in seconds since midnight, Jan. 1, 1904, in UTC time.
|
||||
uint32_t GetTime();
|
||||
|
|
@ -184,7 +186,7 @@ public:
|
|||
bool HasVideoTrack();
|
||||
|
||||
private:
|
||||
uint32_t GetBufPos() { return mOutBuffer.Length(); }
|
||||
uint32_t GetBufPos();
|
||||
nsresult FlushBuf();
|
||||
|
||||
// Audio and video fragments are owned by ISOMediaWriter.
|
||||
|
|
@ -198,13 +200,23 @@ private:
|
|||
// The (index + 1) will be the track ID.
|
||||
nsTArray<nsRefPtr<TrackMetadataBase>> mMetaArray;
|
||||
|
||||
// TODO:
|
||||
// ContainerWriter accepts a array of uint8_t array so it is possible to
|
||||
// create a serial of small box header + swap the raw data pointer from
|
||||
// WriteEncodedTrack to another array without any memory copy.
|
||||
nsTArray<uint8_t> mOutBuffer;
|
||||
// Array of output buffers.
|
||||
// To save memory usage, audio/video sample will be swapped into a new element
|
||||
// of this array.
|
||||
//
|
||||
// For example,
|
||||
// mOutBuffers[0] --> boxes (allocated by muxer)
|
||||
// mOutBuffers[1] --> video raw data (allocated by encoder)
|
||||
// mOutBuffers[2] --> video raw data (allocated by encoder)
|
||||
// mOutBuffers[3] --> video raw data (allocated by encoder)
|
||||
// mOutBuffers[4] --> boxes (allocated by muxer)
|
||||
// mOutBuffers[5] --> audio raw data (allocated by encoder)
|
||||
// ...etc.
|
||||
//
|
||||
nsTArray<nsTArray<uint8_t>> mOutBuffers;
|
||||
|
||||
// Last written position of current box, it is for box checking purpose.
|
||||
// Last written position of current box, it is for box checking purpose and
|
||||
// calculating the sample offset in moof.
|
||||
uint32_t mLastWrittenBoxPos;
|
||||
|
||||
// Accumulate size of output fragments.
|
||||
|
|
|
|||
|
|
@ -40,7 +40,10 @@ Box::BoxSizeChecker::~BoxSizeChecker()
|
|||
if ((cur_size - ori_size) != box_size) {
|
||||
MOZ_ASSERT(false);
|
||||
}
|
||||
mControl->mLastWrittenBoxPos = mControl->mOutBuffer.Length();
|
||||
|
||||
// Keeps the last box size position, it is for counting the sample offset when
|
||||
// generating moof.
|
||||
mControl->mLastWrittenBoxPos += box_size;
|
||||
MOZ_COUNT_DTOR(BoxSizeChecker);
|
||||
}
|
||||
|
||||
|
|
@ -85,8 +88,9 @@ MediaDataBox::Write()
|
|||
|
||||
uint32_t len = frames.Length();
|
||||
for (uint32_t i = 0; i < len; i++) {
|
||||
mControl->Write((uint8_t*)frames.ElementAt(i)->GetFrameData().Elements(),
|
||||
frames.ElementAt(i)->GetFrameData().Length());
|
||||
nsTArray<uint8_t> frame_buffer;
|
||||
frames.ElementAt(i)->SwapOutFrameData(frame_buffer);
|
||||
mControl->WriteAVData(frame_buffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,10 +117,12 @@ ISOMediaWriter::WriteEncodedTrack(const EncodedFrameContainer& aData,
|
|||
// audio/video frames. When CSD data is ready, it is sufficient to generate a
|
||||
// moov data. If encoder doesn't send CSD yet, muxer needs to wait before
|
||||
// generating anything.
|
||||
if (mType & Audio_Track && !mAudioFragmentBuffer->HasCSD()) {
|
||||
if (mType & Audio_Track && (!mAudioFragmentBuffer ||
|
||||
!mAudioFragmentBuffer->HasCSD())) {
|
||||
return NS_OK;
|
||||
}
|
||||
if (mType & Video_Track && !mVideoFragmentBuffer->HasCSD()) {
|
||||
if (mType & Video_Track && (!mVideoFragmentBuffer ||
|
||||
!mVideoFragmentBuffer->HasCSD())) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -193,8 +195,7 @@ ISOMediaWriter::GetContainerData(nsTArray<nsTArray<uint8_t>>* aOutputBufs,
|
|||
mIsWritingComplete = true;
|
||||
}
|
||||
mBlobReady = false;
|
||||
aOutputBufs->AppendElement();
|
||||
return mControl->GetBuf(aOutputBufs->LastElement());
|
||||
return mControl->GetBufs(aOutputBufs);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4791,6 +4791,10 @@ nsDocShell::LoadErrorPage(nsIURI *aURI, const char16_t *aURL,
|
|||
errorPageUrl.AppendASCII(manifestParam.get());
|
||||
}
|
||||
|
||||
nsAutoCString frameType(FrameTypeToString(mFrameType));
|
||||
errorPageUrl.AppendLiteral("&f=");
|
||||
errorPageUrl.AppendASCII(frameType.get());
|
||||
|
||||
nsCOMPtr<nsIURI> errorPageURI;
|
||||
rv = NS_NewURI(getter_AddRefs(errorPageURI), errorPageUrl);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
|
|
|||
|
|
@ -667,6 +667,21 @@ protected:
|
|||
eFrameTypeApp
|
||||
};
|
||||
|
||||
static const nsCString FrameTypeToString(FrameType aFrameType)
|
||||
{
|
||||
switch (aFrameType) {
|
||||
case FrameType::eFrameTypeApp:
|
||||
return NS_LITERAL_CSTRING("app");
|
||||
case FrameType::eFrameTypeBrowser:
|
||||
return NS_LITERAL_CSTRING("browser");
|
||||
case FrameType::eFrameTypeRegular:
|
||||
return NS_LITERAL_CSTRING("regular");
|
||||
default:
|
||||
NS_ERROR("Unknown frame type");
|
||||
return EmptyCString();
|
||||
}
|
||||
}
|
||||
|
||||
FrameType GetInheritedFrameType();
|
||||
|
||||
bool HasUnloadedParent();
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ const Cu = Components.utils;
|
|||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
|
||||
"@mozilla.org/childprocessmessagemanager;1",
|
||||
|
|
@ -76,7 +75,7 @@ ActivityProxy.prototype = {
|
|||
case "Activity:FireSuccess":
|
||||
debug("FireSuccess");
|
||||
Services.DOMRequest.fireSuccess(this.activity,
|
||||
ObjectWrapper.wrap(msg.result, this.window));
|
||||
Cu.cloneInto(msg.result, this.window));
|
||||
Services.obs.notifyObservers(null, "Activity:Success", null);
|
||||
break;
|
||||
case "Activity:FireError":
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ const Ci = Components.interfaces;
|
|||
const Cu = Components.utils;
|
||||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
|
||||
|
|
@ -38,7 +37,7 @@ ActivityWrapper.prototype = {
|
|||
// options is an nsIDOMActivityOptions object.
|
||||
var options = handler.wrappedJSObject._options;
|
||||
options.wrappedJSObject._name = aMessage.payload.name;
|
||||
options.wrappedJSObject._data = ObjectWrapper.wrap(aMessage.payload.data, aWindow);
|
||||
options.wrappedJSObject._data = Cu.cloneInto(aMessage.payload.data, aWindow);
|
||||
|
||||
// When the activity window is closed, fire an error to notify the activity
|
||||
// caller of the situation.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
|
|||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
|
||||
const ALARMSMANAGER_CONTRACTID = "@mozilla.org/alarmsManager;1";
|
||||
const ALARMSMANAGER_CID = Components.ID("{fea1e884-9b05-11e1-9b64-87a7016c3860}");
|
||||
|
|
@ -134,7 +133,7 @@ AlarmsManager.prototype = {
|
|||
alarms.push(alarm);
|
||||
});
|
||||
Services.DOMRequest.fireSuccess(request,
|
||||
ObjectWrapper.wrap(alarms, this._window));
|
||||
Cu.cloneInto(alarms, this._window));
|
||||
break;
|
||||
|
||||
case "AlarmsManager:Add:Return:KO":
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
|
|||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
|
||||
const DEBUG = false;
|
||||
function debug(aMsg) {
|
||||
|
|
@ -175,7 +174,7 @@ InterAppMessagePort.prototype = {
|
|||
},
|
||||
|
||||
_dispatchMessage: function _dispatchMessage(aMessage) {
|
||||
let wrappedMessage = ObjectWrapper.wrap(aMessage, this._window);
|
||||
let wrappedMessage = Cu.cloneInto(aMessage, this._window);
|
||||
if (DEBUG) {
|
||||
debug("_dispatchMessage: wrappedMessage: " +
|
||||
JSON.stringify(wrappedMessage));
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ const Cr = Components.results;
|
|||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/AppsUtils.jsm");
|
||||
Cu.import("resource://gre/modules/BrowserElementPromptService.jsm");
|
||||
|
||||
|
|
@ -277,7 +276,7 @@ let manifestCache = {
|
|||
|
||||
let winObjs = this._cache[aManifestURL];
|
||||
if (!(aInnerWindowID in winObjs)) {
|
||||
winObjs[aInnerWindowID] = ObjectWrapper.wrap(aManifest, aWindow);
|
||||
winObjs[aInnerWindowID] = Cu.cloneInto(aManifest, aWindow);
|
||||
}
|
||||
|
||||
return winObjs[aInnerWindowID];
|
||||
|
|
@ -381,8 +380,7 @@ WebappsApplication.prototype = {
|
|||
|
||||
get updateManifest() {
|
||||
return this.updateManifest =
|
||||
this._updateManifest ? ObjectWrapper.wrap(this._updateManifest,
|
||||
this._window)
|
||||
this._updateManifest ? Cu.cloneInto(this._updateManifest, this._window)
|
||||
: null;
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ const Cu = Components.utils;
|
|||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
|
||||
|
|
@ -175,7 +174,7 @@ MozKeyboard.prototype = {
|
|||
};
|
||||
|
||||
let evt = new this._window.CustomEvent("focuschanged",
|
||||
ObjectWrapper.wrap(detail, this._window));
|
||||
Cu.cloneInto(detail, this._window));
|
||||
handler.handleEvent(evt);
|
||||
} else if (msg.name == "Keyboard:SelectionChange") {
|
||||
let msgJson = msg.json;
|
||||
|
|
@ -188,7 +187,7 @@ MozKeyboard.prototype = {
|
|||
return;
|
||||
|
||||
let evt = new this._window.CustomEvent("selectionchange",
|
||||
ObjectWrapper.wrap({}, this._window));
|
||||
Cu.cloneInto({}, this._window));
|
||||
handler.handleEvent(evt);
|
||||
}
|
||||
},
|
||||
|
|
@ -413,7 +412,7 @@ MozInputMethod.prototype = {
|
|||
}
|
||||
|
||||
let event = new this._window.Event("inputcontextchange",
|
||||
ObjectWrapper.wrap({}, this._window));
|
||||
Cu.cloneInto({}, this._window));
|
||||
this.__DOM_IMPL__.dispatchEvent(event);
|
||||
},
|
||||
|
||||
|
|
@ -552,7 +551,7 @@ MozInputContext.prototype = {
|
|||
case "Keyboard:SetSelectionRange:Result:OK":
|
||||
case "Keyboard:ReplaceSurroundingText:Result:OK":
|
||||
resolver.resolve(
|
||||
ObjectWrapper.wrap(json.selectioninfo, this._window));
|
||||
Cu.cloneInto(json.selectioninfo, this._window));
|
||||
break;
|
||||
case "Keyboard:SequenceError":
|
||||
// Occurs when a new element got focus, but the inputContext was
|
||||
|
|
@ -606,7 +605,7 @@ MozInputContext.prototype = {
|
|||
};
|
||||
|
||||
let event = new this._window.Event(eventName,
|
||||
ObjectWrapper.wrap(aDetail, this._window));
|
||||
Cu.cloneInto(aDetail, this._window));
|
||||
this.__DOM_IMPL__.dispatchEvent(event);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ PreallocatedProcessManagerImpl::PublishSpareProcess(ContentParent* aContent)
|
|||
do_GetService("@mozilla.org/parentprocessmessagemanager;1");
|
||||
nsresult rv = ppmm->BroadcastAsyncMessage(
|
||||
NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"),
|
||||
JS::NullHandleValue, JS::NullHandleValue, cx, 1);
|
||||
JSVAL_NULL, JSVAL_NULL, cx, 1);
|
||||
}
|
||||
|
||||
if (!mNuwaForkWaitTasks.IsEmpty()) {
|
||||
|
|
@ -362,7 +362,7 @@ PreallocatedProcessManagerImpl::OnNuwaReady()
|
|||
do_GetService("@mozilla.org/parentprocessmessagemanager;1");
|
||||
nsresult rv = ppmm->BroadcastAsyncMessage(
|
||||
NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"),
|
||||
JS::NullHandleValue, JS::NullHandleValue, cx, 1);
|
||||
JSVAL_NULL, JSVAL_NULL, cx, 1);
|
||||
}
|
||||
NuwaFork();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ const BrowserElementIsPreloaded = true;
|
|||
Cu.import("resource://gre/modules/Geometry.jsm");
|
||||
Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
|
||||
Cu.import("resource://gre/modules/NetUtil.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/SettingsDB.jsm");
|
||||
Cu.import("resource://gre/modules/SettingsQueue.jsm");
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
[test_NuwaProcessCreation.html]
|
||||
run-if = toolkit == 'gonk'
|
||||
skip-if = true # re-enable when nuwa is enabled.
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ const Cr = Components.results;
|
|||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
|
||||
const kSystemMessageInternalReady = "system-message-internal-ready";
|
||||
|
||||
|
|
@ -94,7 +93,7 @@ SystemMessageManager.prototype = {
|
|||
|
||||
aDispatcher.handler
|
||||
.handleMessage(wrapped ? aMessage
|
||||
: ObjectWrapper.wrap(aMessage, this._window));
|
||||
: Cu.cloneInto(aMessage, this._window));
|
||||
|
||||
// We need to notify the parent one of the system messages has been handled,
|
||||
// so the parent can release the CPU wake lock it took on our behalf.
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
|
|||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
|
||||
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
|
||||
|
||||
// Ensure NetworkStatsService and NetworkStatsDB are loaded in the parent process
|
||||
// to receive messages from the child processes.
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ MozNFCPeer.prototype = {
|
|||
"blob": blob.slice()
|
||||
};
|
||||
return this._nfcContentHelper.sendFile(this._window,
|
||||
ObjectWrapper.wrap(data, this._window),
|
||||
Cu.cloneInto(data, this._window),
|
||||
this.session);
|
||||
},
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ mozNfc.prototype = {
|
|||
_nfcContentHelper: null,
|
||||
_window: null,
|
||||
_wrap: function _wrap(obj) {
|
||||
return ObjectWrapper.wrap(obj, this._window);
|
||||
return Cu.cloneInto(obj, this._window);
|
||||
},
|
||||
|
||||
init: function init(aWindow) {
|
||||
|
|
@ -277,8 +277,7 @@ mozNfc.prototype = {
|
|||
let detail = {
|
||||
"detail":sessionToken
|
||||
};
|
||||
let event = new this._window.CustomEvent(peerEvent,
|
||||
ObjectWrapper.wrap(detail, this._window));
|
||||
let event = new this._window.CustomEvent(peerEvent, this._wrap(detail);
|
||||
this.__DOM_IMPL__.dispatchEvent(event);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ SettingsLock.prototype = {
|
|||
},
|
||||
|
||||
_wrap: function _wrap(obj) {
|
||||
return ObjectWrapper.wrap(obj, this._settingsManager._window);
|
||||
return Cu.cloneInto(obj, this._settingsManager._window);
|
||||
},
|
||||
|
||||
process: function process() {
|
||||
|
|
@ -257,7 +257,7 @@ SettingsManager.prototype = {
|
|||
_callbacks: null,
|
||||
|
||||
_wrap: function _wrap(obj) {
|
||||
return ObjectWrapper.wrap(obj, this._window);
|
||||
return Cu.cloneInto(obj, this._window);
|
||||
},
|
||||
|
||||
nextTick: function nextTick(aCallback, thisObj) {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include <android/log.h>
|
||||
#include <cutils/properties.h>
|
||||
#include <limits>
|
||||
#include "mozilla/dom/network/NetUtils.h"
|
||||
|
||||
#define _DEBUG 0
|
||||
|
|
@ -532,7 +533,7 @@ void NetworkUtils::setQuota(CommandChain* aChain,
|
|||
NetworkResultOptions& aResult)
|
||||
{
|
||||
char command[MAX_COMMAND_SIZE];
|
||||
snprintf(command, MAX_COMMAND_SIZE - 1, "bandwidth setiquota %s %lld", GET_CHAR(mIfname), atoll("0xffffffffffffffff"));
|
||||
snprintf(command, MAX_COMMAND_SIZE - 1, "bandwidth setiquota %s %lld", GET_CHAR(mIfname), LLONG_MAX);
|
||||
|
||||
doCommand(command, aChain, aCallback);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ api.recurly.com: did not receive HSTS header
|
|||
api.simple.com: did not receive HSTS header
|
||||
apis.google.com: did not receive HSTS header (error ignored - included regardless)
|
||||
appengine.google.com: did not receive HSTS header (error ignored - included regardless)
|
||||
bassh.net: did not receive HSTS header
|
||||
bcrook.com: max-age too low: 86400
|
||||
betnet.fr: could not connect to host
|
||||
bigshinylock.minazo.net: could not connect to host
|
||||
|
|
@ -55,7 +56,6 @@ jottit.com: did not receive HSTS header
|
|||
kiwiirc.com: max-age too low: 5256000
|
||||
ledgerscope.net: did not receive HSTS header
|
||||
liberty.lavabit.com: could not connect to host
|
||||
lifeguard.aecom.com: max-age too low: 3600
|
||||
lists.mayfirst.org: did not receive HSTS header
|
||||
lumi.do: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 125" data: no]
|
||||
mail.google.com: did not receive HSTS header (error ignored - included regardless)
|
||||
|
|
@ -102,6 +102,7 @@ talkgadget.google.com: did not receive HSTS header (error ignored - included reg
|
|||
translate.googleapis.com: did not receive HSTS header (error ignored - included regardless)
|
||||
uprotect.it: could not connect to host
|
||||
wallet.google.com: did not receive HSTS header (error ignored - included regardless)
|
||||
webmail.mayfirst.org: did not receive HSTS header
|
||||
whonix.org: did not receive HSTS header
|
||||
www.cueup.com: did not receive HSTS header
|
||||
www.developer.mydigipass.com: could not connect to host
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
/*****************************************************************************/
|
||||
|
||||
#include <stdint.h>
|
||||
const PRTime gPreloadListExpirationTime = INT64_C(1401534344234000);
|
||||
const PRTime gPreloadListExpirationTime = INT64_C(1402139146259000);
|
||||
|
||||
class nsSTSPreload
|
||||
{
|
||||
|
|
@ -30,7 +30,6 @@ static const nsSTSPreload kSTSPreloadList[] = {
|
|||
{ "appseccalifornia.org", true },
|
||||
{ "arivo.com.br", true },
|
||||
{ "bank.simple.com", false },
|
||||
{ "bassh.net", true },
|
||||
{ "bccx.com", true },
|
||||
{ "bitbucket.org", false },
|
||||
{ "blog.cyveillance.com", true },
|
||||
|
|
@ -105,6 +104,7 @@ static const nsSTSPreload kSTSPreloadList[] = {
|
|||
{ "lastpass.com", false },
|
||||
{ "launchkey.com", true },
|
||||
{ "library.linode.com", false },
|
||||
{ "lifeguard.aecom.com", false },
|
||||
{ "linode.com", false },
|
||||
{ "linx.net", false },
|
||||
{ "lockify.com", true },
|
||||
|
|
@ -183,7 +183,6 @@ static const nsSTSPreload kSTSPreloadList[] = {
|
|||
{ "ubertt.org", true },
|
||||
{ "wallet.google.com", true },
|
||||
{ "webmail.gigahost.dk", false },
|
||||
{ "webmail.mayfirst.org", false },
|
||||
{ "webmail.onlime.ch", false },
|
||||
{ "wiki.python.org", true },
|
||||
{ "wiz.biz", true },
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ function sendContentEvent(type, detail) {
|
|||
|
||||
let content = getContentWindow();
|
||||
shell.sendEvent(content, "mozContentEvent",
|
||||
ObjectWrapper.wrap(detail, content));
|
||||
Cu.cloneInto(detail, content));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@
|
|||
"content/html/document/test/test_bug741266.html":"needs control of popup window size",
|
||||
"docshell/test/navigation/test_popup-navigates-children.html":"Needs multiple window.open support, also uses docshelltreenode",
|
||||
"docshell/test/test_bug590573.html":"queryinterfaces into webnavigation, might suffer from something similar as bug 823022",
|
||||
"docshell/test/navigation/test_bug430723.html":"apz race condition, see bug 965351",
|
||||
"dom/devicestorage/ipc/test_ipc.html":"nested ipc not working",
|
||||
|
||||
"dom/indexedDB/ipc/test_ipc.html":"nested ipc not working",
|
||||
|
|
@ -268,7 +267,6 @@
|
|||
"dom/events/test/test_bug574663.html":"",
|
||||
"dom/events/test/test_bug607464.html":"",
|
||||
"dom/events/test/test_wheel_default_action.html":"",
|
||||
"dom/events/test/test_bug946632.html":"apz race condition, see bug 965351",
|
||||
|
||||
"dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126",
|
||||
"dom/file/test/test_request_readyState.html":"",
|
||||
|
|
@ -372,7 +370,6 @@
|
|||
"layout/forms/test/test_bug571352.html":"shift-click multi-select not working?",
|
||||
"layout/forms/test/test_textarea_resize.html":"resizing textarea not available in b2g",
|
||||
"layout/forms/test/test_bug903715.html":"select elements don't use an in-page popup in B2G",
|
||||
"layout/forms/test/test_bug564115.html":"apz race condition, see bug 965351",
|
||||
"layout/generic/test/test_bug392746.html":"ctrl mouse select not working in b2g",
|
||||
"layout/generic/test/test_bug791616.html":"Target should not have scrolled - got 114.10000610351562, expected 115.39999389648438",
|
||||
"layout/generic/test/test_invalidate_during_plugin_paint.html":"plugins not supported",
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ var steps = [
|
|||
installTestApp = function (url, appId, callback) {
|
||||
let installResponse, appObject;
|
||||
let installedEvent = false;
|
||||
mm.sendAsyncMessage("install", {url: url, appId: appId});
|
||||
mm.addMessageListener("installed", function onInstalled(aResponse) {
|
||||
mm.removeMessageListener("installed", onInstalled);
|
||||
ok(true, "install request replied");
|
||||
|
|
@ -112,7 +113,6 @@ var steps = [
|
|||
if (appObject && installResponse && installedEvent)
|
||||
callback(installResponse, appObject);
|
||||
}
|
||||
mm.sendAsyncMessage("install", {url: url, appId: appId});
|
||||
};
|
||||
SpecialPowers.autoConfirmAppInstall(next);
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче