Commit Graph

258510 Commits

Author SHA1 Message Date
Bobby Holley
c4c2164df2 Bug 1188976 - Improve MozPromise.h comment. r=me DONTBUILD 2015-08-19 17:13:45 -07:00
Wes Kocher
23c57742cd Merge m-c to inbound, a=merge CLOSED TREE 2015-08-19 17:13:12 -07:00
Wes Kocher
9b51b0bb9d Merge inbound to central, a=merge 2015-08-19 17:03:29 -07:00
Wes Kocher
7c9aeda810 Merge fx-team to central, a=merge 2015-08-19 17:02:20 -07:00
Wes Kocher
f6147ac656 Backed out 4 changesets (bug 1191178) to see if it will fix the build bustage on a CLOSED TREE
Backed out changeset 32adb36cf863 (bug 1191178)
Backed out changeset 85cb22235eb5 (bug 1191178)
Backed out changeset 744bab15a5ec (bug 1191178)
Backed out changeset b7621c6af97e (bug 1191178)
2015-08-19 16:13:13 -07:00
Wes Kocher
3947493d19 Backed out changeset ee8d28602bc2 (bug 1191647) for build bustage CLOSED TREE 2015-08-19 15:55:05 -07:00
Wes Kocher
33bb841610 Backed out changeset f00b7bf7b9f8 (bug 1196371) for build bustage CLOSED TREE 2015-08-19 15:49:30 -07:00
Milan Sreckovic
91184fe12b Bug 1188105: Parse bad driver versions. r=botond 2015-08-19 15:14:59 -07:00
Honza Bambas
499d9d2c58 Bug 1188983 - mozilla::Tokenizer improvements, r=nfroyd 2015-08-19 15:14:25 -07:00
Hiroyuki Ikezoe
fefea25bb1 Bug 1191178 - Part 2: Add PerformanceRenderTiming and PerformanceCompositeTiming. r=smaug 2015-08-19 15:14:05 -07:00
Hiroyuki Ikezoe
781d54ee60 Bug 1191178 - Part 1: Add a function to check frame timing preference value. r=smaug 2015-08-19 15:11:15 -07:00
Hiroyuki Ikezoe
32154eb6df Bug 1191178 - Part 0.1: GetSriLog() is needed to avoid unified build failure. r=francois 2015-08-19 15:10:52 -07:00
Hiroyuki Ikezoe
aff2b88eb5 Bug 1191178 - Part 0: Fix unified build in dom/base. Add missing headers and sorting them. r=smaug 2015-08-19 15:10:28 -07:00
B2G Bumper Bot
91245d2188 Bumping manifests a=b2g-bump 2015-08-19 12:02:07 -07:00
B2G Bumper Bot
d092d4872d Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/68da3c242dcd
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31378 from jimporter/music-metadata-doc

Bug 1181272 - [music] Provide developer documentation (metadata part)

========

https://hg.mozilla.org/integration/gaia-central/rev/505989869c14
Author: Jim <jporter@mozilla.com>
Desc: Add docs for the metadata parser and correct some comments

========

https://hg.mozilla.org/integration/gaia-central/rev/19230eeaa34a
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31382 from jimporter/music-bulletproof-metadata

Bug 1191760 - [music] Speculative patch to bulletproof metadata parsi…

========

https://hg.mozilla.org/integration/gaia-central/rev/3b4fce661d9f
Author: Jim <jporter@mozilla.com>
Desc: Bug 1191760 - [music] Speculative patch to bulletproof metadata parsing even further

========

https://hg.mozilla.org/integration/gaia-central/rev/6ff99926696b
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #31381 from jimporter/music-open-activity

Bug 1193498 - [Music] Opening a downloaded song doesn't work

========

https://hg.mozilla.org/integration/gaia-central/rev/42264926d255
Author: Jim <jporter@mozilla.com>
Desc: Bug 1193498 - [Music] Opening a downloaded song doesn't work
2015-08-19 12:00:29 -07:00
Andrea Marchesini
6d750e332a Bug 1192350 - XMLHttpRequest::Open() should check if mProxy has been already released in a nested ::Open() calls, r=khuey 2015-08-19 18:26:13 +01:00
Nathan Froyd
777ee9b302 Backout 5377759a3145:0dfb6e5f8223 (bug 1171945) for SM ARM compilation bustage 2015-08-19 21:20:57 -04:00
B2G Bumper Bot
42d0a7ad92 Bumping manifests a=b2g-bump 2015-08-19 10:21:49 -07:00
B2G Bumper Bot
da2b9501a1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6310c0674f2d
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31419 from mwargers/1196231

Bug 1196231 - Fix error in ftu_step3.py in is_data_alert_switch_checked

========

https://hg.mozilla.org/integration/gaia-central/rev/5f3d54545f0b
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1196231 - Fix error in ftu_step3.py in is_data_alert_switch_checked
2015-08-19 10:20:10 -07:00
B2G Bumper Bot
da552bf391 Bumping manifests a=b2g-bump 2015-08-19 09:57:15 -07:00
B2G Bumper Bot
d32d90ed64 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6bc7ea353785
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #31210 from julienw/1190276-body-and-number-activity

Bug 1190276 - [Messages] In a "new" activity, don't redirect to a thread if there is a specified body r=azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/1363542fe78e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1190276 - [Messages] In a "new" activity, don't redirect to a thread if there is a specified body r=azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/30172d27e0ea
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #31424 from arcturus/bug-1186108

Bug 1186108 - [Contacts] Cannot share contact via MMS. r=francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/127ae8c4af66
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1186108 - [Contacts] Cannot share contact via MMS. r=francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/5c565e6d72b0
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #31425 from wilsonpage/1022134

Bug 1022134 - [Camera] Remove snap back rotation in AF indicator animation

========

https://hg.mozilla.org/integration/gaia-central/rev/7ac080d99487
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1022134 - [Camera] Remove snap back rotation in AF indicator animation
2015-08-19 09:55:31 -07:00
B2G Bumper Bot
476b26df93 Bumping manifests a=b2g-bump 2015-08-19 09:07:10 -07:00
B2G Bumper Bot
cbd214fd07 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ba3b3d8d1379
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #31176 from wilsonpage/1151625

Bug 1151625 - [Camera][Volume Rocker] Pressing the volume button during a self timer countdown will not cancel the countdown

========

https://hg.mozilla.org/integration/gaia-central/rev/bbada9e1c5e1
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1151625 - [Camera][Volume Rocker] Pressing the volume button during a self timer countdown will not cancel the countdown

========

https://hg.mozilla.org/integration/gaia-central/rev/940a1c38f21a
Author: Tzu-Lin Huang <dwi2@dwi2.com>
Desc: Merge pull request #31387 from dwi2/bug1193163

Bug 1193163 - [JSDOC] write documentation of smart-home in jsdoc format

========

https://hg.mozilla.org/integration/gaia-central/rev/f4eaf0b420c1
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1193163 - [JSDOC] write documentation of smart-home in jsdoc format
2015-08-19 09:05:32 -07:00
B2G Bumper Bot
5e9c055d3e Bumping manifests a=b2g-bump 2015-08-19 07:56:47 -07:00
B2G Bumper Bot
840bd527e7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8d04695c1582
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #31398 from Cwiiis/bug1191746-new-homescreen-marionette-remaining-app-tests

Bug 1191746 - Port remaining app tests to new homescreen. r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/57323361364f
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1191746 - Port remaining app tests to new homescreen. r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/427356d4bc45
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #31395 from Cwiiis/bug1191746-new-homescreen-marionette-packaged-app-tests

Bug 1191746 - Port packaged app tests to new homescreen. r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/1f14518b694f
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1191746 - Port packaged app tests to new homescreen. r=gmarty
2015-08-19 07:55:10 -07:00
B2G Bumper Bot
717740ae58 Bumping manifests a=b2g-bump 2015-08-19 06:14:37 -07:00
B2G Bumper Bot
b119307ff9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/afda764ea25c
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #31372 from borjasalguero/update_selfcontained_rebased

Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #…

========

https://hg.mozilla.org/integration/gaia-central/rev/39f61a0cf7ef
Author: borjasalguero <borja.salguero@gmail.com>
Desc: Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #open within Contacts App r=arcturus
2015-08-19 06:12:58 -07:00
B2G Bumper Bot
71ac7e85a6 Bumping manifests a=b2g-bump 2015-08-19 05:48:45 -07:00
B2G Bumper Bot
6d4ecc0253 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7f8c58134988
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #31308 from wilsonpage/1191671

Bug 1191671 - clearing previous search in rocketbar should not dismiss keyboard

========

https://hg.mozilla.org/integration/gaia-central/rev/513eec64eac4
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1191671 - clearing previous search in rocketbar should not dismiss keyboard
2015-08-19 05:47:07 -07:00
B2G Bumper Bot
8a1732d852 Bumping manifests a=b2g-bump 2015-08-19 05:02:05 -07:00
B2G Bumper Bot
bfa9db7606 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cf72b9fb98db
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #31291 from yzen/bug-1192400"

This reverts commit 4f19ee670de652ccab72da15ed3b8677cfbb7240, reversing
changes made to 9bc579e7bcb269077e8116b4031440eb9ebe61ec.
2015-08-19 05:00:27 -07:00
Ryan VanderMeulen
18a8227b2b Merge m-c to b2g-inbound. a=merge 2015-08-19 07:47:16 -04:00
Ryan VanderMeulen
f984c012fd Merge fx-team to m-c. a=merge 2015-08-19 07:45:12 -04:00
Ryan VanderMeulen
2f3e364704 Merge m-c to b2g-inbound. a=merge 2015-08-19 07:41:58 -04:00
Ryan VanderMeulen
a90634b569 Backed out 3 changesets (bug 1180556, bug 1180555, bug 1180554) for test_interfaces.html failures.
Backed out changeset 3210b4a21f50 (bug 1180556)
Backed out changeset d08f41259fb9 (bug 1180555)
Backed out changeset ad74716bf6e7 (bug 1180554)
2015-08-19 07:26:50 -04:00
Ryan VanderMeulen
4f782249d9 Merge b2g-inbound to m-c. a=merge 2015-08-19 07:24:55 -04:00
B2G Bumper Bot
cc49a92930 Bumping manifests a=b2g-bump 2015-08-19 03:26:53 -07:00
B2G Bumper Bot
2fed329ecc Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/df7f8e5b22a1
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31403 from mwargers/1195483

Bug 1195483 - Fix failure in test_settings_power_save_mode.py

========

https://hg.mozilla.org/integration/gaia-central/rev/2459d602ee01
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1195483 - Fix failure in test_settings_power_save_mode.py

========

https://hg.mozilla.org/integration/gaia-central/rev/c44da7891037
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31401 from mwargers/1188924

Bug 1188924 - Make centralized workaround function for the issue related to bug 1109213

========

https://hg.mozilla.org/integration/gaia-central/rev/4c6c5abe2095
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1188924 - Make centralized workaround function for the issue related to bug 1109213

========

https://hg.mozilla.org/integration/gaia-central/rev/3c47c59b79df
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #31192 from zapion/bug_1185501

Bug 1185501 - Support mozlog 3.0 in gaiatest

========

https://hg.mozilla.org/integration/gaia-central/rev/2a1ae602d273
Author: Paul Zapion Yang <zapionator@gmail.com>
Desc: Bug 1185501 - Support mozlog 3.0 in gaiatest
2015-08-19 03:25:13 -07:00
B2G Bumper Bot
64a50d073e Bumping manifests a=b2g-bump 2015-08-19 03:02:09 -07:00
B2G Bumper Bot
b475dd99aa Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/58b11b4cf43e
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31415 from gasolin/issue-1175955

Bug 1175955 - set default lockscreen.locked to false, r=greg, ricky

========

https://hg.mozilla.org/integration/gaia-central/rev/253933d2dbbb
Author: gasolin <gasolin@gmail.com>
Desc: set default lockscreen.locked to false, r=greg
2015-08-19 03:00:29 -07:00
B2G Bumper Bot
23519d2bea Bumping manifests a=b2g-bump 2015-08-19 01:44:53 -07:00
Masayuki Nakano
580a61e26e Bug 299603 part.8 Rename aLastDispatchedData with aCompositionString in IMContextWrapper::CreateTextRangeArray() r=m_kato 2015-08-19 16:37:39 +09:00
Masayuki Nakano
fed80aad8b Bug 299603 part.7 IMContextWrapper::CreateTextRange() should convert the caret offset from offset in characters to offset in UTF-16 r=m_kato 2015-08-19 16:37:39 +09:00
Masayuki Nakano
0c2d8d2d8c Bug 299603 part.6 Guess the meaning of each clause in the composition string with caret position r=m_kato 2015-08-19 16:37:39 +09:00
Masayuki Nakano
84ee60a0ff Bug 299603 part.5 nsTextFrame should use system foreground or background color when painting IME selections if whose style defines only one of foreground color or background color r=roc 2015-08-19 16:37:39 +09:00
Masayuki Nakano
9bfb2a4edf Bug 299603 part.4 Some global methods in nsTextFrame.cpp should be members of nsTextFrame class r=roc 2015-08-19 16:37:39 +09:00
Masayuki Nakano
4b8097cd96 Bug 299603 part.3 IMContextWrapper::SetTextRange() shold set the style of the range which is specified by the IME r=m_kato 2015-08-19 16:37:39 +09:00
Masayuki Nakano
6f0e893a2f Bug 299603 part.2 IMContextWrapper::SetTextRange() should initialize the range offsets and fail if the range is collapsed r=m_kato 2015-08-19 16:37:39 +09:00
Masayuki Nakano
c01cde218b Bug 299603 part.1 IMContextWrapper should have a method to initialize a TextRange r=m_kato 2015-08-19 16:37:39 +09:00
B2G Bumper Bot
3c5a4c491a Bumping manifests a=b2g-bump 2015-08-19 00:14:34 -07:00