Граф коммитов

446 Коммитов

Автор SHA1 Сообщение Дата
Ryan VanderMeulen b8cc2a9367 Merge inbound to m-c on a CLOSED TREE. a=merge 2014-06-26 17:13:04 -04:00
Hsin-Yi Tsai 6692260140 Bug 1030042 - [B2G] use notifyDialSuccess(callIndex) for Cdma features. r=aknow 2014-06-25 17:47:41 +08:00
Carsten "Tomcat" Book 1fbbf3e900 Merge mozilla-central to b2g-inbound 2014-06-25 16:21:26 +02:00
Hsin-Yi Tsai a371243260 Bug 1030030 - [B2G] follow-up of Bug 1028099 - use call.id.number. r=aknow 2014-06-25 17:16:59 +08:00
Szu-Yu Chen [:aknow] a4531a4034 Bug 1028099 - Hang up calls locally in setup stage. r=hsinyi 2014-06-24 03:36:00 -04:00
Szu-Yu Chen [:aknow] 8c6046d07f Bug 1027513 - Extract CreateCall and CreateCallId. r=hsinyi 2014-06-24 06:52:00 -04:00
Jim Blandy 7e20285e70 Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Wes Kocher 4c297ef8c0 Merge m-c to inbound a=merge 2014-06-23 18:59:54 -07:00
Benoit Jacob ec742680c8 Bug 1028588 - Fix dangerous public destructors in the rest of dom/ - r=ehsan 2014-06-23 15:56:07 -04:00
Szu-Yu Chen [:aknow] b1f59cc47c Bug 1027996 - Part 3: For tests: No need to check emulator OK result. r=hsinyi 2014-06-23 06:25:00 -04:00
Szu-Yu Chen [:aknow] aab931c982 Bug 1027996 - Part 2: For tests: Rename emulator.run to emulator.runWithCallback. r=hsinyi 2014-06-23 06:25:00 -04:00
Szu-Yu Chen [:aknow] 9e5aae8d3e Bug 1027996 - Part 1: Change emulator.run to promise version. r=hsinyi 2014-06-23 06:24:00 -04:00
Hsin-Yi Tsai 4f379ab9eb Bug 981519 - number and name presentation - part 4b - fix ril typo during rebasing. r=me 2014-06-20 11:25:18 +08:00
Hsin-Yi Tsai f340659109 Bug 981519 - number and name presentation - part 6 - test_call_presentation.js. r=vicamo 2014-05-15 14:37:19 +08:00
Hsin-Yi Tsai cb27624fa2 Bug 981519 - number and name presentation - part 4 - ril impl. r=vicamo 2014-04-16 19:43:08 +08:00
Hsin-Yi Tsai fd995e0e3c Bug 981519 - number and name presentation - part 3 - DOM & IPC code. r=smaug 2014-04-10 14:25:42 +08:00
Hsin-Yi Tsai 7d2e93703e Bug 981519 - number and name presentation - part 2 - internal api. r=vicamo 2014-04-16 19:07:11 +08:00
Birunthan Mohanathas bc0233fe47 Bug 1026535 - Fix mismatched class/struct tags. r=ehsan 2014-06-18 17:57:51 -07:00
Hsin-Yi Tsai 82c54ce959 Backed out changeset 75b36820d545 (bug 981519) for causing regression bug 1026081 2014-06-17 15:37:31 +08:00
Hsin-Yi Tsai 478c777a6c Backed out changeset 598098217e1f (bug 981519) for causing regression bug 1026081 2014-06-17 15:37:31 +08:00
Hsin-Yi Tsai 50b2eca4c8 Backed out changeset 03919674446d (bug 981519) for causing regression bug 1026081 2014-06-17 15:37:31 +08:00
Hsin-Yi Tsai d9545eeb3d Backed out changeset db71d2354a77 (bug 981519) for causing regression bug 1026081 2014-06-17 15:37:31 +08:00
Szu-Yu Chen [:aknow] b3b134d636 Bug 1014903 - Get active call by query. r=hsinyi 2014-06-12 19:34:00 -04:00
Hsin-Yi Tsai 5f76ac3b9d Bug 981519 - number and name presentation - part 6 - test_call_presentation.js. r=vicamo 2014-05-15 14:37:19 +08:00
Hsin-Yi Tsai 44d9d18ea5 Bug 981519 - number and name presentation - part 4 - ril impl. r=vicamo 2014-04-16 19:43:08 +08:00
Hsin-Yi Tsai 279886c354 Bug 981519 - number and name presentation - part 3 - DOM & IPC code. r=smaug 2014-04-10 14:25:42 +08:00
Hsin-Yi Tsai 9405057330 Bug 981519 - number and name presentation - part 2 - internal api. r=vicamo 2014-04-16 19:07:11 +08:00
Vicamo Yang 8d5be851b4 Bug 1023148 - Use WebIDL codegen to implement RIL & WiFi events. r=smaug 2014-06-11 09:23:34 +08:00
Chris Peterson 5d92f25884 Bug 1024322 - Replace calls to MOZ_ASSUME_UNREACHABLE that have crept back into dom. r=smaug 2014-06-20 22:42:45 -07:00
Szu-Yu Chen [:aknow] 283734ec19 Bug 1014903 - Handle audio state change properly. r=hsinyi 2014-06-09 02:47:00 -04:00
Boris Zbarsky a0760577c7 Bug 1016560. Remove the footgun of rejecting promises with arbitrary objects. r=khuey 2014-06-03 11:38:38 -04:00
Vicamo Yang fa6b7968d6 Bug 927320 - 2/2: rename related variables. r=aknow,btian 2014-06-03 22:15:30 +08:00
Vicamo Yang cff89f3dbc Bug 927320 - 1/2: rename TelephonyProvider to TelephonyService. r=aknow
--HG--
rename : dom/telephony/gonk/TelephonyProvider.js => dom/telephony/gonk/TelephonyService.js
rename : dom/telephony/gonk/TelephonyProvider.manifest => dom/telephony/gonk/TelephonyService.manifest
rename : dom/telephony/ipc/TelephonyIPCProvider.cpp => dom/telephony/ipc/TelephonyIPCService.cpp
rename : dom/telephony/ipc/TelephonyIPCProvider.h => dom/telephony/ipc/TelephonyIPCService.h
rename : dom/telephony/nsIGonkTelephonyProvider.idl => dom/telephony/nsIGonkTelephonyService.idl
rename : dom/telephony/nsITelephonyProvider.idl => dom/telephony/nsITelephonyService.idl
2014-06-03 22:15:25 +08:00
Szu-Yu Chen [:aknow] 953fdc4df9 Bug 1018051 - Delay 1s in test_outgoing_emergency_in_airplane_mode.js. r=echen 2014-05-30 03:33:00 +08:00
Szu-Yu Chen [:aknow] 9be248ac38 Bug 1016849 - Part 4: Remove isActive (provider). r=hsinyi 2014-05-29 00:16:00 -04:00
Szu-Yu Chen [:aknow] fd74ad258f Bug 1016849 - Part 2: Remove isActive (dom). r=hsinyi 2014-05-29 00:15:00 -04:00
Szu-Yu Chen [:aknow] 5e87410479 Bug 1016849 - Part 1: Remove isActive (interface and ipc). r=hsinyi 2014-05-29 00:15:00 -04:00
Szu-Yu Chen [:aknow] e109c7cd41 Bug 1017413 - Make sure emulator command is ok. r=hsinyi 2014-05-29 15:15:21 +08:00
Hsin-Yi Tsai 7651190fbd Bug 1016276 - [B2G] revise test_outgoing_answer_hangup_oncallschanged.js - wait for 'dialing' state. r=edgar 2014-05-27 18:36:35 +08:00
Szu-Yu Chen [:aknow] ffa65aa310 Bug 1013745 - Part 4: Refine dialling process and pending call mechanism. r=hsinyi 2014-05-26 19:08:00 +02:00
Szu-Yu Chen [:aknow] f2fe96a740 Bug 1013745 - Part 3: Get callIndex when dialling success (ipc). r=hsinyi 2014-05-26 19:08:00 +02:00
Szu-Yu Chen [:aknow] 23f7dd33ce Bug 1013745 - Part 2: Get callIndex when dialling success (dom). r=hsinyi 2014-05-26 19:08:00 +02:00
Szu-Yu Chen [:aknow] 7a3db3c134 Bug 1013745 - Part 1: Get callIndex when dialling success (interface). r=hsinyi 2014-05-26 19:07:00 +02:00
Szu-Yu Chen [:aknow] 2769a06313 Bug 1015097 - Rewrite test_outgoing_emergency_in_airplane_mode.js. r=hsinyi 2014-05-25 20:22:00 +02:00
Szu-Yu Chen [:aknow] 2854b32242 Bug 1012504 - Rewrite test_emergency_label.js. r=hsinyi 2014-05-19 01:42:00 +02:00
Szu-Yu Chen [:aknow] b40b0bd655 Bug 1005816 - Part 1: Remove delay of telephony diai in test case. r=hsinyi 2014-05-20 18:36:40 +08:00
Hsin-Yi Tsai 331b1a0196 Bug 1011429 - [B2G][RIL] correctly update phone_state in cdma 3way call scenario. r=aknow 2014-05-16 17:14:11 +08:00
Szu-Yu Chen [:aknow] d44101b207 Bug 1003652 - Turn on debugging in marionette test. r=hsinyi, jgriffin 2014-05-16 14:05:33 +08:00
Ed Morley f81fd51388 Backed out changeset 254616e044b1 (bug 993282) 2014-05-15 17:01:36 +01:00
Ben Turner e97775227c Bug 1007398 - Properly handle racing destruction of PTelephonyChild actors, r=hsinyi. 2014-05-08 11:41:58 -07:00
Fabrice Desré 14682ee809 Bug 993282 - Lazy load more js modules - Part 3: RIL r=gene 2014-05-07 15:53:17 -07:00
Wes Kocher f3d33b739c Backed out 3 changesets (bug 993282) for b2g emulator mochitest 3 failures
Backed out changeset 30e0991d49e0 (bug 993282)
Backed out changeset 6b9c8d6ab401 (bug 993282)
Backed out changeset 96e1a542bb45 (bug 993282)
2014-05-07 18:47:17 -07:00
Wes Kocher afa4265863 Merge m-c to b2g-inbound 2014-05-07 17:39:54 -07:00
Wes Kocher 0e7578947c merge inbound to m-c 2014-05-07 17:06:22 -07:00
Fabrice Desré 77817a3d43 Bug 993282 - Lazy load more js modules - Part 3: RIL r=gene 2014-05-07 15:53:17 -07:00
Szu-Yu Chen [:aknow] 17ec8b0562 Bug 997003 - Refactor: setupConference in test code. r=hsinyi 2014-05-07 18:30:00 +08:00
Szu-Yu Chen [:aknow] 0737ab5dba Bug 1004152 - Delay telephony.dial for 1s in test cases. r=hsinyi 2014-05-07 01:52:00 -04:00
Szu-Yu Chen [:aknow] 6698675305 Bug 1005498 - Ignore audio setting for place holder call. r=hsinyi 2014-05-06 03:01:00 +02:00
Birunthan Mohanathas a85cd37de4 Bug 1001966 - Part 2: Change uses of numbered NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE macro to the variadic variant. r=smaug 2014-04-29 04:57:00 -04:00
Birunthan Mohanathas 5f1fde8824 Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj 2014-04-27 03:06:00 -04:00
Birunthan Mohanathas 7ac92ae5ea Bug 900903 - Part 2: Change uses of numbered macros in nsCycleCollectionParticipant.h to the variadic variants. r=smaug 2014-04-25 12:49:00 -04:00
Szu-Yu Chen [:aknow] e6385fa706 Bug 996444 - Remove gTelephonyList. r=hsinyi 2014-04-22 17:57:05 +08:00
Szu-Yu Chen [:aknow] 2bacf62ef4 Bug 977085 - Remove nsIGonkTelephonyProvider::notifyCallError. r=hsinyi 2014-04-22 17:55:06 +08:00
Szu-Yu Chen [:aknow] a7f1b68392 Bug 990472 - Part 3: Test case. r=hsinyi 2014-04-16 10:26:51 -04:00
Szu-Yu Chen [:aknow] b6b83efb6c Bug 990472 - Part 2: Add check for more than 2 calls on line. r=hsinyi 2014-04-16 10:26:50 -04:00
Szu-Yu Chen [:aknow] fc9794e555 Bug 990472 - Part 1: Refactor: check of call on other client. r=hsinyi 2014-04-16 10:26:50 -04:00
Hsin-Yi Tsai d90e3c2181 Bug 989728 - [B2G] [RIL] split test_conference.js into smaller pieces to avoid timeout failure. r=vicamo
* * *
split test_conference.js - p4 - split test_conference
2014-04-08 14:10:06 +08:00
Etienne Segonzac 075f5c6c43 Bug 992948 - Add missing data to the telephony-call-ended systemmessage. r=hsinyi 2014-04-10 10:01:58 -04:00
Boris Zbarsky 79dab91ff6 Bug 991742 part 8. Remove the "aScope" argument of WebIDL/nsWrapperCache WrapObject() methods. r=bholley
This patch was mostly generated with the following command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e '/WrapObject(JSContext/ {; N; s/\(WrapObject(JSContext *\* *a\{0,1\}[Cc]x\),\n\{0,1\} *JS::Handle<JSObject\*> a\{0,1\}[sS]cope/\1/ ; }' -i ""

and then reverting the changes that made to
dom/bindings/BindingUtils.h, since those WrapObject methods are not
the ones we're trying to change here, plus a bunch of manual fixups
for cases that this command did not catch (including all the callsites
of WrapObject()).
2014-04-08 18:27:18 -04:00
Boris Zbarsky d4bd64ee2c Bug 991742 part 6. Remove the "aScope" argument of binding Wrap() methods. r=bholley
This patch was mostly generated with this command:

find . -name "*.h" -o -name "*.cpp" | xargs sed -e 's/Binding::Wrap(aCx, aScope, this/Binding::Wrap(aCx, this/' -e 's/Binding_workers::Wrap(aCx, aScope, this/Binding_workers::Wrap(aCx, this/' -e 's/Binding::Wrap(cx, scope, this/Binding::Wrap(cx, this/' -i ""

plus a few manual fixes to dom/bindings/Codegen.py, js/xpconnect/src/event_impl_gen.py, and a few C++ files that were not caught in the search-and-replace above.
2014-04-08 18:27:17 -04:00
Szu-Yu Chen [:aknow] 49fb08a3bf Bug 990467 - Part 3: DOM: Re-order code to avoid multi-thread issue. r=hsinyi 2014-04-04 08:18:49 -04:00
Szu-Yu Chen [:aknow] 2d3ffc0fe8 Bug 990467 - Part 2: Add pending outgoing call. r=hsinyi 2014-04-04 08:18:17 -04:00
Ryan VanderMeulen 0d5b7940ce Merge inbound to m-c. 2014-04-01 16:45:00 -04:00
Szu-Yu Chen (Aknow) 356f132f9d Bug 984919 - Part 2: Test DSDS connection conflict. r=hsinyi 2014-04-01 08:58:55 -04:00
Szu-Yu Chen (Aknow) 5345e64005 Bug 984919 - Part 1: Cannot place a new call if other sim is in use. r=hsinyi 2014-04-01 08:58:55 -04:00
Ed Morley 52fa01875b Backed out changeset a3d1c00b6592 (bug 984919) for causing bug 988979 2014-03-28 17:03:17 +00:00
Ed Morley 230f8e0bab Backed out changeset 7dcecf85a869 (bug 984919) 2014-03-28 17:03:00 +00:00
Masayuki Nakano 930436ef24 Bug 984269 Rename nsDOMEventTargetHelper to mozilla::DOMEventTargetHelper r=smaug
--HG--
rename : dom/events/nsDOMEventTargetHelper.cpp => dom/events/DOMEventTargetHelper.cpp
rename : dom/events/nsDOMEventTargetHelper.h => dom/events/DOMEventTargetHelper.h
2014-04-01 15:13:50 +09:00
Hsin-Yi Tsai 5aee9100f8 Bug 984289 - [B2G] [RIL] add marionette-webapi tests for conference error. r=vicamo 2014-03-17 18:40:29 +08:00
Szu-Yu Chen (Aknow) 4341c8d03f Bug 984919 - Part 2: Test DSDS connection conflict. r=hsinyi 2014-03-21 02:46:00 +01:00
Szu-Yu Chen (Aknow) 51fa93e656 Bug 984919 - Part 1: Cannot place a new call if other sim is in use. r=hsinyi 2014-03-21 02:44:00 +01:00
Hsin-Yi Tsai ac1bf381e1 Bug 979626 - Crash in Telephony while running stability scripts. r=vicamo 2014-03-05 20:19:38 +08:00
Hsin-Yi Tsai 5b37303f55 Bug 984326 - [B2G] [RIL] [CDMA] call waiting isn't working properly. The 2nd remote party cannot hear voice. r=vicamo 2014-03-18 15:57:32 +08:00
Masayuki Nakano 08a11f7934 Bug 975688 part.28 Rename nsDOMEvent to mozilla::dom::Event r=smaug
--HG--
rename : dom/events/nsDOMEvent.cpp => dom/events/Event.cpp
rename : dom/events/nsDOMEvent.h => dom/events/Event.h
2014-03-05 09:37:43 +09:00
Hsin-Yi Tsai 535c668bf1 Bug 881174 - part4 - cdma 3way call DOM and IPC. r=vicamo 2014-02-21 17:52:13 +08:00
Hsin-Yi Tsai 62be8a001c Bug 881174 - part3 - cdma 3way call internal idl. r=vicamo 2014-02-21 17:51:07 +08:00
Hsin-Yi Tsai 9f41a650ba Bug 881174 - part2 - cdma 3way call RIL impl. r=vicamo 2014-02-21 17:46:58 +08:00
Szu-Yu Chen [:aknow] c2e7beb833 Bug 969218 - Part 6: Use promise for dial and dialEmergency - ipc. r=khuey 2014-02-27 14:12:30 +08:00
Szu-Yu Chen [:aknow] 9e18467e1a Bug 969218 - Part 5: Use promise for dial and dialEmergency - provider. r=hsinyi 2014-02-27 14:12:30 +08:00
Szu-Yu Chen [:aknow] 5984abb426 Bug 969218 - Part 4: Use promise for dial and dialEmergency - dom. r=khuey 2014-02-27 14:12:30 +08:00
Szu-Yu Chen [:aknow] 7bf294c150 Bug 969218 - Part 3: Use promise for dial and dialEmergency - internal interface. r=hsinyi 2014-02-27 14:12:30 +08:00
Szu-Yu Chen [:aknow] 907dc6ec41 Bug 969218 - Part 2: Modify tests. r=hsinyi 2014-02-27 14:12:30 +08:00
Ryan VanderMeulen f8f5c07e4a Backed out 6 changesets (bug 969218) for bustage. DONTBUILD
Backed out changeset 86356906ecf0 (bug 969218)
Backed out changeset 46fa16a18c27 (bug 969218)
Backed out changeset 75219ceb5175 (bug 969218)
Backed out changeset b9f4ba525eec (bug 969218)
Backed out changeset 323c1329614b (bug 969218)
Backed out changeset e0fa4e0eee36 (bug 969218)
2014-02-26 14:27:54 -05:00
Szu-Yu Chen [:aknow] 62d137cd0f Bug 969218 - Part 6: ipc r=khuey 2014-02-26 11:03:56 -08:00
Szu-Yu Chen [:aknow] dbdabe1593 Bug 969218 - Part 5: gonk provider r=htsai 2014-02-26 11:03:56 -08:00
Szu-Yu Chen [:aknow] 99433a9c4c Bug 969218 - Part 4: dom r=khuey 2014-02-26 11:03:56 -08:00
Szu-Yu Chen [:aknow] 9be6dfb91b Bug 969218 - Part 3: Internal interface r=htsai 2014-02-26 11:03:56 -08:00
Szu-Yu Chen [:aknow] d578298c98 Bug 969218 - Part 2: Modify tests r=htsai 2014-02-26 11:03:55 -08:00
Szu-Yu Chen [:aknow] 2e3a5ca278 Bug 968713 - Remove callError in ril_worker. r=hsinyi 2014-02-12 14:31:13 +08:00
Edgar Chen b77bf22e98 Bug 964974 - Part 2: Marionette test for radio off during active voice call. r=hsinyi 2014-02-06 18:50:25 +08:00