Ed Morley
ed2038903a
Merge mozilla-central and inbound
2014-08-14 08:54:39 +01:00
Ed Morley
32c617d0c3
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
2014-08-14 08:42:29 +01:00
Andrea Marchesini
6e94520d99
Bug 1053269 - Null-check for ownerDoc OpenDatabaseHelper.cpp, r=ehsan
2014-08-14 07:36:13 +02:00
Jamin Liu
927837ef0c
Bug 1043180 - Write a marionette test for Bluetooth pairing based on Bluetooth API v2. r=btian
2014-08-14 11:34:22 +08:00
Jamin Liu
182368b8f5
Bug 1036234 - Fix the follow-up errors from implementation of pairing event handlers. r=btian
2014-08-14 11:34:10 +08:00
Ryan VanderMeulen
ae3acc3246
Merge m-c to fx-team. a=merge
2014-08-13 15:32:14 -04:00
Ryan VanderMeulen
52289280cd
Merge inbound to m-c. a=merge
2014-08-13 15:30:49 -04:00
Ed Morley
f54ca128fa
Merge mozilla-central and b2g-inbound
2014-08-13 17:02:34 +01:00
Ed Morley
05e830e560
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
2014-08-13 16:28:32 +01:00
Makoto Kato
3a99ae6318
Backed out changeset 5b8f52a76065 (bug 1050660) due to mochitest-2 failure on Linux
2014-08-13 16:33:37 +09:00
Andrea Marchesini
111bb0ee47
Bug 1046240 - Expose the principal for a blob URI for chrome-only js code. r=smaug
2014-08-13 08:29:00 -04:00
Brian Birtles
94984390c8
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
e0d8a1ab35
Bug 1052388 - Rename JS_CallHeapFooTracer() functions to JS_CallFooTracer() r=terrence r=smaug
2014-08-13 10:05:22 +01:00
Alexandre Lissy
c1a5a0ca0e
Bug 1052435 - Fix handling of Notification with tag. r=mhenretty
...
This commit fixes two bugs. When sending two notifications with the same
tag, the NotificationDB this.byTag member was not properly updated. This
resulted in multiple notifications with the same tag being saved.
NotificationStorage's cache may hide this during the running session,
but on B2G the resend of notifications at reboot would expose the issue.
The second bug fixed is the test that makes sure we properly overwrite
notifications with the same tag in the database: the way we handled fake
notification object made them sharing the same ID. This, NotificationDB
would not even consider the tags and this lead to hiding the bug.
2014-08-12 10:15:00 -04:00
Szu-Yu Chen [:aknow]
ceb7d859cf
Bug 1051715 - Part 2: Also pass number in notifyDialSuccess. r=hsinyi
2014-08-12 23:51:00 -04:00
Szu-Yu Chen [:aknow]
7fb6a60be9
Bug 1051715 - Part 1: Add temporary clir test. r=hsinyi
2014-08-12 23:50:00 -04:00
Makoto Kato
f711537c24
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
0a860d51b6
Bug 1050577: [NFC] Techlost not clearing peer appId correctly. r=allstars.chh
2014-08-11 16:03:35 -07:00
Ryan VanderMeulen
c232e68ef3
Merge inbound to m-c. a=merge
2014-08-12 16:24:50 -04:00
Ed Morley
0bd1cb7a32
Merge mozilla-central and b2g-inbound
2014-08-12 17:54:47 +01:00
Reuben Morais
10736f728a
Bug 1009645 - Follow up, disable mozTime test.
2014-08-12 13:50:12 -03:00
Ed Morley
1129a8ed5e
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
2014-08-12 17:05:36 +01:00
Yoshi Huang
1ac3575c20
Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi
2014-08-12 17:04:51 +08:00
Jamin Liu
ce6e38e6ed
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
5d07e5487b
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
9699a70dd0
Bug 1036233 - Initialize the data member of BluetoothDevice. r=btian
2014-08-12 16:30:26 +08:00
Nigel Babu
09d63c0d06
Merge m-c to m-i
2014-08-12 12:20:36 +05:30
Alphan Chen
33828161c0
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
aa716c50f3
Backed out changeset 2d0ebc1bc7d6 (bug 1036233) for build bustage ON A CLOSED TREE
2014-08-12 09:00:30 +05:30
Nigel Babu
5d366768d5
Backed out changeset c5d50f1bc995 (bug 1036233) for build bustage ON A CLOSED TREE
2014-08-12 09:00:20 +05:30
Nigel Babu
7e2132868b
Backed out changeset a471c7c73409 (bug 1036234) for build bustage on A CLOSED TREE
2014-08-12 09:00:08 +05:30
Jamin Liu
3f63587fec
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
875bc52b44
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
d7fd552bb2
Bug 1036233 - Initialize the data member of BluetoothDevice. r=btian
2014-08-12 10:49:43 +08:00
Bobby Holley
c3b77ac838
Bug 1050049 - Implement bindToUntrustedContent attribute restriction. r=smaug
2014-08-11 20:06:55 -07:00
Bobby Holley
1fb855d00b
Bug 1050049 - Whitelist bindings that we actually expect to use in content. r=smaug
2014-08-11 20:06:55 -07:00
Benoit Jacob
dbfddd83d7
Bug 777574 - Skip all quickCheckAPI tests on all linux/android/emulator slaves - r=kamidphish
2014-08-11 22:57:16 -04:00
Wes Kocher
4d3dfafdc4
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
0dc3c5353f
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é
edc30acde0
Bug 1051114 - 400 MozInterAppMessagePort registered on frame message manager r=bent
2014-08-11 10:37:09 -07:00
Szu-Yu Chen [:aknow]
abe40b3bdc
Bug 1050696 - Refactor TelephonyService.dial. r=hsinyi
2014-08-11 02:48:00 -04:00
Martijn Wargers
06d99401c1
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
79151b5134
Merge mozilla-central and inbound
2014-08-12 17:56:08 +01:00
Ryan VanderMeulen
cfeeeb589b
Backed out changeset 3200ed3305db (bug 1014023) for causing bug 1051164.
2014-08-12 12:44:09 -04:00
Morris Tseng
07c5a3a821
Bug 1020802 - Pass collapsed and reason information to selectionchange event. r=ehsan, sr=smaug
2014-08-10 20:37:00 -04:00
Chris Lord
46a53f7d64
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
c091848b83
Merge m-c to inbound
2014-08-11 16:19:27 -07:00
Wes Kocher
c2ecdbcdd9
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
9af0513091
Merge inbound to m-c. a=merge
2014-08-11 16:10:07 -04:00
Szu-Yu Chen [:aknow]
b1432684d4
Bug 1051663 - Correct |this| in REQUEST_DIAL_EMERGENCY_CALL. r=hsinyi
2014-08-11 02:37:00 -04:00