wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound a=merge CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-10-29 15:29:24 -07:00
commit f44184efc6
13 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -121,3 +121,4 @@ b297a6727acfd21e757ddd38cd61894812666265 FIREFOX_AURORA_36_BASE
312c68b16549de9cea1557f461d5d234bd5e0a7d FIREFOX_AURORA_41_BASE
7a19194812eb767bee7cdf8fc36ba9a383c1bead FIREFOX_AURORA_42_BASE
fcef8ded82219c89298b4e376cfbdfba79a1d35a FIREFOX_AURORA_43_BASE
67a788db9f07822cfef52351bbbe3745dff8bd7f FIREFOX_AURORA_44_BASE

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1219585 - fixing intermittent 10.7 debug failures
Merge day clobber

2
b2g/confvars.sh
View File

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=B2G
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=44.0a1
MOZ_APP_VERSION=45.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_UA_OS_AGNOSTIC=1

2
browser/config/version.txt
View File

@ -1 +1 @@
44.0a1
45.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
44.0a1
45.0a1

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
44.0a1
45.0a1

1
dom/plugins/test/mochitest/mochitest.ini
View File

@ -69,6 +69,7 @@ skip-if = e10s
[test_hanging.html]
skip-if = !crashreporter || e10s
[test_instance_re-parent.html]
skip-if = release_build # Bug 1172627
[test_instance_unparent1.html]
[test_instance_unparent2.html]
[test_instance_unparent3.html]

4
js/src/asmjs/AsmJSValidate.cpp
View File

@ -8153,7 +8153,9 @@ CheckModule(ExclusiveContext* cx, AsmJSParser& parser, ParseNode* stmtList,
m.startFunctionBodies();
#if !defined(ENABLE_SHARED_ARRAY_BUFFER)
MOZ_ASSERT(!m.module().hasArrayView() || !m.module().isSharedView());
if (m.module().hasArrayView() && m.module().isSharedView())
return m.failOffset(m.parser().tokenStream.currentToken().pos.begin,
"shared views not supported by this build");
#endif
ScopedJSDeletePtr<ModuleCompileResults> mcd;

2
js/src/jit-test/tests/asm.js/gating.js
View File

@ -7,7 +7,7 @@
// Note code is not run, so the only issue here is whether it compiles
// properly as asm.js.
if (!isAsmJSCompilationAvailable())
if (!this.SharedArrayBuffer || !isAsmJSCompilationAvailable())
quit(0);
function module_a(stdlib, foreign, heap) {

2
services/sync/moz.build
View File

@ -46,7 +46,7 @@ EXTRA_PP_JS_MODULES['services-sync'] += [
]
# Definitions used by constants.js
DEFINES['weave_version'] = '1.46.0'
DEFINES['weave_version'] = '1.47.0'
DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
EXTRA_JS_MODULES['services-sync'].engines += [

40
toolkit/components/telemetry/Histograms.json
View File

@ -8360,7 +8360,7 @@
},
"LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1": {
"alert_emails": ["firefox-dev@mozilla.org", "dmose@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 8,
"releaseChannelCollection": "opt-out",
@ -8368,7 +8368,7 @@
},
"LOOP_SHARING_STATE_CHANGE_1": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 8,
"releaseChannelCollection": "opt-out",
@ -8376,7 +8376,7 @@
},
"LOOP_SHARING_ROOM_URL": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 8,
"releaseChannelCollection": "opt-out",
@ -8384,7 +8384,7 @@
},
"LOOP_ROOM_CREATE": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 4,
"releaseChannelCollection": "opt-out",
@ -8392,7 +8392,7 @@
},
"LOOP_ROOM_DELETE": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 4,
"releaseChannelCollection": "opt-out",
@ -8400,7 +8400,7 @@
},
"LOOP_ROOM_CONTEXT_ADD": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "enumerated",
"n_values": 8,
"releaseChannelCollection": "opt-out",
@ -8408,14 +8408,14 @@
},
"LOOP_ROOM_CONTEXT_CLICK": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"releaseChannelCollection": "opt-out",
"description": "Number times room context is clicked to visit the attached URL"
},
"LOOP_ROOM_SESSION_WITHCHAT": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"releaseChannelCollection": "opt-out",
"description": "Number of sessions where at least one chat message was exchanged"
@ -9691,14 +9691,14 @@
},
"FXA_CONFIGURED": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "flag",
"releaseChannelCollection": "opt-out",
"description": "If the user is signed in to a Firefox Account on this device"
},
"FXA_UNVERIFIED_ACCOUNT_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9706,7 +9706,7 @@
},
"FXA_HAWK_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9714,7 +9714,7 @@
},
"FXA_SERVER_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9722,7 +9722,7 @@
},
"TOKENSERVER_AUTH_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9730,7 +9730,7 @@
},
"WEAVE_ENGINE_APPLY_NEW_FAILURES": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9738,7 +9738,7 @@
},
"WEAVE_ENGINE_APPLY_FAILURES": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9746,7 +9746,7 @@
},
"WEAVE_ENGINE_SYNC_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9754,21 +9754,21 @@
},
"WEAVE_CAN_FETCH_KEYS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "flag",
"releaseChannelCollection": "opt-out",
"description": "Whether Sync keys are present in account storage."
},
"WEAVE_FXA_KEY_FETCH_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"releaseChannelCollection": "opt-out",
"description": "Errors encountered fetching Sync keys, including network errors."
},
"WEAVE_STORAGE_AUTH_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"keyed": true,
"releaseChannelCollection": "opt-out",
@ -9776,7 +9776,7 @@
},
"WEAVE_HMAC_ERRORS": {
"alert_emails": ["fx-team@mozilla.com"],
"expires_in_version": "45",
"expires_in_version": "46",
"kind": "count",
"releaseChannelCollection": "opt-out",
"description": "Sync cryptoKeys collection HMAC mismatches."

2
tools/mercurial/hgsetup/config.py
View File

@ -12,7 +12,7 @@ import os
HOST_FINGERPRINTS = {
'bitbucket.org': '46:de:34:e7:9b:18:cd:7f:ae:fd:8b:e3:bc:f4:1a:5e:38:d7:ac:24',
'bugzilla.mozilla.org': 'f9:7e:62:42:4e:38:79:96:ca:87:71:2a:f8:51:38:c8:16:92:5c:a7',
'bugzilla.mozilla.org': '7c:7a:c4:6c:91:3b:6b:89:cf:f2:8c:13:b8:02:c4:25:bd:1e:25:17',
'hg.mozilla.org': 'af:27:b9:34:47:4e:e5:98:01:f6:83:2b:51:c9:aa:d8:df:fb:1a:27',
}

2
xpcom/components/Module.h
View File

@ -22,7 +22,7 @@ namespace mozilla {
*/
struct Module
{
static const unsigned int kVersion = 44;
static const unsigned int kVersion = 45;
struct CIDEntry;