Commit Graph

24802 Commits

Author SHA1 Message Date
Ed Morley
fe15d8f328 Merge mozilla-central and inbound 2014-08-13 17:03:24 +01:00
Ed Morley
f8cfdd662d Backed out changeset 1a2dcc132344 (bug 1022818) for B2G failures in test_scroll_behavior.html; CLOSED TREE 2014-08-13 16:31:11 +01:00
Ed Morley
f69a81b897 Backed out changeset d24b367f3ac4 (bug 1022818) 2014-08-13 16:30:50 +01:00
Ed Morley
9992f03145 Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-13 16:28:32 +01:00
Andrea Marchesini
73a742002b Bug 1043106 - part 2 - StorageEvent should have the storageArea of the correct window, r=smaug 2014-08-13 15:55:44 +02:00
Makoto Kato
92149f5d45 Backed out changeset 5b8f52a76065 (bug 1050660) due to mochitest-2 failure on Linux 2014-08-13 16:33:37 +09:00
Brian Birtles
51fed648c3 Bug 1052147 - Initialize AnimationPlayer::mPlayState to running state; r=dbaron
The assertion in nsTimeStamp::operator >= occasionally fails due to a null RHS
timestamp when called from AnimationPlayer::GetCurrentTimeDuration, which, in
turn, is called from AnimationPlayer::SetSource.

The issue appears to be that we're not correctly initializing
AnimationPlayer.mPlayState. This value can be running (0) or paused (1) but we
only ever compare against the paused state (i.e. every other value is
effectively treated as running). If we don't initialize this we can end
up in the paused state but with mPauseStart not set to a valid (non-null)
TimeStamp. This creates an inconsistent state since we assume that when we're
paused mPauseStart is non-null, hence the assertion fails.

This gets tickled because, since bug 1040543, we call
AnimationPlayer::SetSource from nsAnimationManager::BuildAnimations *before* we
set mPlayState and mPauseStart.

This patch initializes mPlayState to the running state so we don't accidentally
end up in an inconsistent state.

It also removes some (now unnecessary) initialization of mPlayState and
mPauseStart from nsTransitionManager::ConsiderStartingTransition.

In future we could also consider reworking nsAnimationManager::BuildAnimations
so that we call SetSource on the new animation player *after* setting up its
play state. That may be more correct and would further avoid this problem but
may not be necessary since all that code is likely to change in the near future.
2014-08-13 18:21:45 +09:00
Jon Coppeard
a4a71fde44 Bug 1052388 - Rename JS_CallHeapFooTracer() functions to JS_CallFooTracer() r=terrence r=smaug 2014-08-13 10:05:22 +01:00
Makoto Kato
05ecbcb18a Bug 1050660 - setInputMethodActive doesn't sometimes work when switching IME imminently after boot. r=fabrice 2014-08-12 11:50:30 +09:00
Garner Lee
f61c289d4c Bug 1050577: [NFC] Techlost not clearing peer appId correctly. r=allstars.chh 2014-08-11 16:03:35 -07:00
Ryan VanderMeulen
d7de573f64 Merge inbound to m-c. a=merge 2014-08-12 16:24:50 -04:00
Ed Morley
e067296409 Merge mozilla-central and b2g-inbound 2014-08-12 17:54:47 +01:00
Reuben Morais
aad1b5c650 Bug 1009645 - Follow up, disable mozTime test. 2014-08-12 13:50:12 -03:00
Ed Morley
bbebcef8bf Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-12 17:05:36 +01:00
Yoshi Huang
f28c154070 Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi 2014-08-12 17:04:51 +08:00
Jamin Liu
d3a304e7e3 Bug 1036234 - Implement pairing event handlers of BluetoothAdapter. r=btian, r=mrbkap
- EventHandler ondevicepaired;
- EventHandler ondeviceunpaired;
2014-08-12 16:30:42 +08:00
Jamin Liu
c92f96eaa6 Bug 1036233 - Implement pairing methods of Bluetooth API v2. r=btian, r=mrbkap
- Promise<void> pair(DOMString aAddress)
- Promise<void> unpair(DOMString aAddress)
- sequence<BluetoothDevice> getPairedDevices()
2014-08-12 16:30:36 +08:00
Jamin Liu
628526cbe7 Bug 1036233 - Initialize the data member of BluetoothDevice. r=btian 2014-08-12 16:30:26 +08:00
Nigel Babu
654359f1ef Merge m-c to m-i 2014-08-12 12:20:36 +05:30
Alphan Chen
7348810bd4 Bug 1050720 - [DeviceStorage] Avoid to send the same status in two continuous storage-state-change event. r=dhylands 2014-08-11 23:31:00 -04:00
Nigel Babu
9858b7f9c4 Backed out changeset 2d0ebc1bc7d6 (bug 1036233) for build bustage ON A CLOSED TREE 2014-08-12 09:00:30 +05:30
Nigel Babu
c92019faa9 Backed out changeset c5d50f1bc995 (bug 1036233) for build bustage ON A CLOSED TREE 2014-08-12 09:00:20 +05:30
Nigel Babu
da90530683 Backed out changeset a471c7c73409 (bug 1036234) for build bustage on A CLOSED TREE 2014-08-12 09:00:08 +05:30
Jamin Liu
86709c14f4 Bug 1036234 - Implement pairing event handlers of BluetoothAdapter. r=btian, r=mrbkap
- EventHandler ondevicepaired;
- EventHandler ondeviceunpaired;
2014-08-12 10:49:59 +08:00
Jamin Liu
a33ca7691a Bug 1036233 - Implement pairing methods of Bluetooth API v2. r=btian, r=mrbkap
- Promise<void> pair(DOMString aAddress)
- Promise<void> unpair(DOMString aAddress)
- sequence<BluetoothDevice> getPairedDevices()
2014-08-12 10:49:53 +08:00
Jamin Liu
c6f4dbe265 Bug 1036233 - Initialize the data member of BluetoothDevice. r=btian 2014-08-12 10:49:43 +08:00
Bobby Holley
573baa0e7a Bug 1050049 - Implement bindToUntrustedContent attribute restriction. r=smaug 2014-08-11 20:06:55 -07:00
Bobby Holley
2157f88dfc Bug 1050049 - Whitelist bindings that we actually expect to use in content. r=smaug 2014-08-11 20:06:55 -07:00
Benoit Jacob
d4b463cdd8 Bug 777574 - Skip all quickCheckAPI tests on all linux/android/emulator slaves - r=kamidphish 2014-08-11 22:57:16 -04:00
Wes Kocher
b04134dbf2 Backed out changeset 49086e9caa4e (bug 1051114) for making Gaia-unit tests timeout on a CLOSED TREE 2014-08-11 15:27:58 -07:00
Yoshi Huang
1f36877080 Bug 1051754 - B2G NFC: Add marionette test for peer.sendFile. r=dimi
From 3cfb06874b6e838ad76e1817c7b69df81e0f802b Mon Sep 17 00:00:00 2001
---
 dom/nfc/tests/marionette/head.js                   | 20 +++++++--
 dom/nfc/tests/marionette/manifest.ini              |  1 +
 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js | 49 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
2014-08-11 18:26:52 +08:00
Fabrice Desré
1b2c3f60c8 Bug 1051114 - 400 MozInterAppMessagePort registered on frame message manager r=bent 2014-08-11 10:37:09 -07:00
Szu-Yu Chen [:aknow]
c0aa8ed457 Bug 1050696 - Refactor TelephonyService.dial. r=hsinyi 2014-08-11 02:48:00 -04:00
Martijn Wargers
174ea37131 Bug 1032878 - Fix for various failing mochitest-plain/-chrome tests. r=jmaher, r=akachkach, r=surkov, r=cpearce 2014-08-10 20:03:50 -07:00
Ed Morley
565f70db0c Merge mozilla-central and inbound 2014-08-12 17:56:08 +01:00
Ryan VanderMeulen
bbbbaa19d4 Backed out changeset 3200ed3305db (bug 1014023) for causing bug 1051164. 2014-08-12 12:44:09 -04:00
Chris Lord
bf797a46b8 Bug 1051513 - Fix update of webapp activity registration. r=fabrice
Remove all old activities for a given manifest before re-registering new ones.
2014-08-11 23:21:44 +01:00
Wes Kocher
63a5782589 Merge m-c to inbound 2014-08-11 16:19:27 -07:00
Wes Kocher
0e8de3ce49 Backed out 4 changesets (bug 1032878) for probably introducing a leak, creating a CLOSED TREE
Backed out changeset 780c948d79f3 (bug 1032878)
Backed out changeset 0cfcc44660a8 (bug 1032878)
Backed out changeset 991f8d5da382 (bug 1032878)
Backed out changeset f54984be223e (bug 1032878)
2014-08-11 14:27:57 -07:00
Ryan VanderMeulen
552da54d71 Merge inbound to m-c. a=merge 2014-08-11 16:10:07 -04:00
Szu-Yu Chen [:aknow]
4f0650cc40 Bug 1051663 - Correct |this| in REQUEST_DIAL_EMERGENCY_CALL. r=hsinyi 2014-08-11 02:37:00 -04:00
Evelyn Hung
2de8fdc9d0 Bug 1044960 - Remove unnecessary lines from TabChild.cpp. r=kats 2014-08-07 22:10:00 -04:00
Dimi Lee
80c690d47a Bug 936367 - Support wifi hotspot enable API. r=vchang, r=ptheriault, sr=mrbkap 2014-08-11 17:13:25 +08:00
Yoshi Huang
6e2d19f6db Bug 1051738 - B2G NFC: typo in getNFCPeer. r=dimi
From bea6af520beedcc4547ce5c45c4d78faa63d5812 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2014-08-11 17:19:11 +08:00
Yoshi Huang
0f1e3b3420 Bug 1049351 - [NFC] fix testPeerShouldThrow. r=dimi 2014-08-11 15:45:35 +08:00
Valentin Gosu
0bb663ecce Bug 1051109 - Define non-static method to jsonify interface attributes r=smaug 2014-08-11 01:17:50 +03:00
Jed Davis
66d1734f54 Bug 1043733 - Require sandboxing to load Gecko Media Plugins on Linux. r=jesup r=kang
Also refactors how sandbox support and disabling are handled, and allows
simulating a lack of sandbox support with an env var (for testing
without rebuilding a kernel).
2014-08-12 21:28:27 -07:00
Ryan VanderMeulen
b0e8e0344f Merge m-c to b2g-inbound. a=merge 2014-08-11 17:18:31 -04:00
Olli Pettay
f9c9c2b2db Bug 1050665 - Make returnMessage and returnNumber nullable. r=ehsan, r=smaug to make the commit hook happy
--HG--
extra : amend_source : 089934856605faebd8406c58d3fac94ced73fe46
2014-08-11 07:52:00 -04:00
Fabrice Desré
5d2c441691 Bug 1051114 - 400 MozInterAppMessagePort registered on frame message manager r=bent 2014-08-11 10:37:09 -07:00