From 4292b620c5b0e5d6750ed06719f662d12dc4963b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 01:35:32 -0700 Subject: [PATCH 01/14] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f4b0b276eb8f Author: Timothy Guan-tin Chien Desc: Merge pull request #22461 from timdream/keyboard-vwrapper-css Bug 1048025 - Set pointer-events: none to visual-wrapper, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/0d72a2159857 Author: Timothy Guan-tin Chien Desc: Bug 1048025 - Set pointer-events: none to visual-wrapper --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 0be8473461eb..e10a34f40efd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "075c487ef7d017a8d3c1c65e2e76a8e949f58cc8", + "revision": "f4b0b276eb8f31d05a98b83b1e03dad29deff96a", "repo_path": "/integration/gaia-central" } From cbc4a6d2b1e1bb1ef63e20fefffddd3fd3f89138 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 01:41:17 -0700 Subject: [PATCH 02/14] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e4f42aa088b3..7e00fe38abbc 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d8f266a8a92e..6292d9618258 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ba544455d145..4f39cfa1797e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e4f42aa088b3..7e00fe38abbc 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 7e484659fdf4..119aaa8c686c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index bbb1b3eed8b8..a191bfb23025 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index b4c761a22419..6948c5e74b44 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bec9f4a48cf2..81d08e108a9c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index b72472b133d9..49c0bcc499c0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 748b647f0e042e3709a8d72aa96acb0253e75c4d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 01:50:33 -0700 Subject: [PATCH 03/14] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5ac5df7f279b Author: evelynhung Desc: Merge pull request #22382 from crh0716/1046068 Bug 1046068 - Add the default value for mms delivery report ======== https://hg.mozilla.org/integration/gaia-central/rev/12f299ead266 Author: Arthur Chen Desc: Bug 1046068 - Add the default value for mms delivery report --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e10a34f40efd..c5dac29f5c2b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f4b0b276eb8f31d05a98b83b1e03dad29deff96a", + "revision": "5ac5df7f279b1548965362289c6bb393a8dda942", "repo_path": "/integration/gaia-central" } From 128748b5b641fdd3e424a0ae5881e87154153894 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 01:56:20 -0700 Subject: [PATCH 04/14] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7e00fe38abbc..65824651d014 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6292d9618258..0e2569b17597 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 4f39cfa1797e..f0f3895b3b48 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7e00fe38abbc..65824651d014 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 119aaa8c686c..76d21e2e5dc4 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a191bfb23025..1a9b9b34b5e3 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 6948c5e74b44..e2a9a302117b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 81d08e108a9c..048a4fa25259 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 49c0bcc499c0..cc881c565804 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 96f10d3a69ae3f8b218cfb29ffab4af33516cbcd Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Mon, 4 Aug 2014 17:01:36 +0800 Subject: [PATCH 05/14] Bug 916607 - 1/4: Convert MozSmsSegmentInfo to WebIDL dictionary. Interface changes. r=bzbarsky, r=khuey --- dom/mobilemessage/interfaces/moz.build | 1 - .../interfaces/nsIDOMSmsSegmentInfo.idl | 16 --------------- .../interfaces/nsIMobileMessageCallback.idl | 7 ++++--- .../interfaces/nsIMobileMessageService.idl | 7 +------ .../interfaces/nsISmsService.idl | 1 - dom/mobilemessage/src/ipc/PSmsRequest.ipdl | 4 +++- dom/mobilemessage/src/ipc/SmsTypes.ipdlh | 7 ------- dom/webidl/MozMobileMessageManager.webidl | 20 +++++++++++++++++++ 8 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build index 5fb9a55cdddb..62952307a93d 100644 --- a/dom/mobilemessage/interfaces/moz.build +++ b/dom/mobilemessage/interfaces/moz.build @@ -10,7 +10,6 @@ XPIDL_SOURCES += [ 'nsIDOMMozMobileMessageThread.idl', 'nsIDOMMozSmsMessage.idl', 'nsIDOMSmsFilter.idl', - 'nsIDOMSmsSegmentInfo.idl', 'nsIMmsService.idl', 'nsIMobileMessageCallback.idl', 'nsIMobileMessageCursorCallback.idl', diff --git a/dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl b/dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl deleted file mode 100644 index eaa4c153116d..000000000000 --- a/dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl +++ /dev/null @@ -1,16 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsISupports.idl" - -[scriptable, builtinclass, uuid(57ac3989-531e-4928-998b-53fde81a05a6)] -interface nsIDOMMozSmsSegmentInfo : nsISupports -{ - /* The number of total segments for the input string. */ - readonly attribute long segments; - /* The number of characters available per segment. */ - readonly attribute long charsPerSegment; - /* The maximum number of available characters in the last segment. */ - readonly attribute long charsAvailableInLastSegment; -}; diff --git a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl index 31bcca4158e5..b7651e56607a 100644 --- a/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl +++ b/dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl @@ -3,9 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" -#include "nsIDOMSmsSegmentInfo.idl" -[scriptable, uuid(0e6f8ace-cc59-11e3-aad5-e32847abfda1)] +[scriptable, uuid(35279dbc-9f1d-419f-b17a-230fcf49f0c7)] interface nsIMobileMessageCallback : nsISupports { /** @@ -45,7 +44,9 @@ interface nsIMobileMessageCallback : nsISupports void notifyMessageMarkedRead(in boolean read); void notifyMarkMessageReadFailed(in long error); - void notifySegmentInfoForTextGot(in nsIDOMMozSmsSegmentInfo info); + void notifySegmentInfoForTextGot(in long segments, + in long charsPerSegment, + in long charsAvailableInLastSegment); void notifyGetSegmentInfoForTextFailed(in long error); /** diff --git a/dom/mobilemessage/interfaces/nsIMobileMessageService.idl b/dom/mobilemessage/interfaces/nsIMobileMessageService.idl index a524ff156863..320b7edb3bd9 100644 --- a/dom/mobilemessage/interfaces/nsIMobileMessageService.idl +++ b/dom/mobilemessage/interfaces/nsIMobileMessageService.idl @@ -8,14 +8,13 @@ interface nsIDeletedMessageInfo; interface nsIDOMMozSmsMessage; interface nsIDOMMozMmsMessage; interface nsIDOMMozMobileMessageThread; -interface nsIDOMMozSmsSegmentInfo; %{C++ #define MOBILE_MESSAGE_SERVICE_CID { 0x829c1dd6, 0x0466, 0x4591, { 0x83, 0x6f, 0xb8, 0xf6, 0xfd, 0x1f, 0x7b, 0xa5 } } #define MOBILE_MESSAGE_SERVICE_CONTRACTID "@mozilla.org/mobilemessage/mobilemessageservice;1" %} -[scriptable, builtinclass, uuid(afb83948-003a-11e4-899b-bb8a8d45e7f0)] +[scriptable, builtinclass, uuid(bc28e604-53ee-4be9-af20-268ce9efc61a)] interface nsIMobileMessageService : nsISupports { [implicit_jscontext] @@ -50,10 +49,6 @@ interface nsIMobileMessageService : nsISupports in unsigned long long expiryDate, in boolean readReportRequested); - nsIDOMMozSmsSegmentInfo createSmsSegmentInfo(in long segments, - in long charsPerSegment, - in long charsAvailableInLastSegment); - [implicit_jscontext] nsIDOMMozMobileMessageThread createThread(in unsigned long long id, in jsval participants, diff --git a/dom/mobilemessage/interfaces/nsISmsService.idl b/dom/mobilemessage/interfaces/nsISmsService.idl index b586e51e6589..615cedd15808 100644 --- a/dom/mobilemessage/interfaces/nsISmsService.idl +++ b/dom/mobilemessage/interfaces/nsISmsService.idl @@ -5,7 +5,6 @@ #include "nsISupports.idl" interface nsIDOMMozSmsMessage; -interface nsIDOMMozSmsSegmentInfo; interface nsIMobileMessageCallback; %{C++ diff --git a/dom/mobilemessage/src/ipc/PSmsRequest.ipdl b/dom/mobilemessage/src/ipc/PSmsRequest.ipdl index fa1ac8d4c9d9..ff1584c16748 100644 --- a/dom/mobilemessage/src/ipc/PSmsRequest.ipdl +++ b/dom/mobilemessage/src/ipc/PSmsRequest.ipdl @@ -74,7 +74,9 @@ struct ReplyMarkeMessageReadFail struct ReplyGetSegmentInfoForText { - SmsSegmentInfoData infoData; + int32_t segments; + int32_t charsPerSegment; + int32_t charsAvailableInLastSegment; }; struct ReplyGetSegmentInfoForTextFail diff --git a/dom/mobilemessage/src/ipc/SmsTypes.ipdlh b/dom/mobilemessage/src/ipc/SmsTypes.ipdlh index 18b54ac60102..5cc1283310cb 100644 --- a/dom/mobilemessage/src/ipc/SmsTypes.ipdlh +++ b/dom/mobilemessage/src/ipc/SmsTypes.ipdlh @@ -17,13 +17,6 @@ namespace mozilla { namespace dom { namespace mobilemessage { -struct SmsSegmentInfoData -{ - int32_t segments; - int32_t charsPerSegment; - int32_t charsAvailableInLastSegment; -}; - struct SmsMessageData { int32_t id; diff --git a/dom/webidl/MozMobileMessageManager.webidl b/dom/webidl/MozMobileMessageManager.webidl index b36fb59c5098..6f92d3de1628 100644 --- a/dom/webidl/MozMobileMessageManager.webidl +++ b/dom/webidl/MozMobileMessageManager.webidl @@ -8,6 +8,26 @@ interface MozMmsMessage; interface MozSmsFilter; interface MozSmsMessage; +dictionary SmsSegmentInfo { + /** + * The number of total segments for the input string. The value is always + * larger-equal than 1. + */ + long segments = 0; + + /** + * The number of characters available per segment. The value is always + * larger-equal than 1. + */ + long charsPerSegment = 0; + + /** + * The maximum number of available characters in the last segment. The value + * is always larger-equal than 0. + */ + long charsAvailableInLastSegment = 0; +}; + dictionary MmsAttachment { DOMString? id = null; DOMString? location = null; From bdbe52a2e463846e176a6557062e31af512376c7 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Mon, 4 Aug 2014 17:01:36 +0800 Subject: [PATCH 06/14] Bug 916607 - 2/4: implementation. r=bzbarsky, r=gene --- dom/base/nsDOMClassInfo.cpp | 8 --- dom/base/nsDOMClassInfoClasses.h | 1 - .../src/MobileMessageCallback.cpp | 25 ++++++- .../src/MobileMessageService.cpp | 13 ---- dom/mobilemessage/src/SmsSegmentInfo.cpp | 65 ------------------- dom/mobilemessage/src/SmsSegmentInfo.h | 39 ----------- dom/mobilemessage/src/android/SmsService.cpp | 1 - dom/mobilemessage/src/gonk/SmsService.cpp | 1 - dom/mobilemessage/src/ipc/SmsChild.cpp | 10 +-- dom/mobilemessage/src/ipc/SmsIPCService.cpp | 1 - dom/mobilemessage/src/ipc/SmsParent.cpp | 10 +-- dom/mobilemessage/src/moz.build | 2 - dom/system/gonk/RadioInterfaceLayer.js | 8 +-- 13 files changed, 36 insertions(+), 148 deletions(-) delete mode 100644 dom/mobilemessage/src/SmsSegmentInfo.cpp delete mode 100644 dom/mobilemessage/src/SmsSegmentInfo.h diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 6a5bca1d9f92..c05dd0668a1d 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -127,7 +127,6 @@ #include "nsIDOMMozSmsMessage.h" #include "nsIDOMMozMmsMessage.h" #include "nsIDOMSmsFilter.h" -#include "nsIDOMSmsSegmentInfo.h" #include "nsIDOMMozMobileMessageThread.h" #ifdef MOZ_B2G_FM @@ -353,9 +352,6 @@ static nsDOMClassInfoData sClassInfoData[] = { NS_DEFINE_CLASSINFO_DATA(MozSmsFilter, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(MozSmsSegmentInfo, nsDOMGenericSH, - DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(MozMobileMessageThread, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) @@ -942,10 +938,6 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozSmsFilter) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(MozSmsSegmentInfo, nsIDOMMozSmsSegmentInfo) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozSmsSegmentInfo) - DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(MozMobileMessageThread, nsIDOMMozMobileMessageThread) DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozMobileMessageThread) DOM_CLASSINFO_MAP_END diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index e069a30361d6..9ee2c1f6c747 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -56,7 +56,6 @@ DOMCI_CLASS(ModalContentWindow) DOMCI_CLASS(MozSmsMessage) DOMCI_CLASS(MozMmsMessage) DOMCI_CLASS(MozSmsFilter) -DOMCI_CLASS(MozSmsSegmentInfo) DOMCI_CLASS(MozMobileMessageThread) // @font-face in CSS diff --git a/dom/mobilemessage/src/MobileMessageCallback.cpp b/dom/mobilemessage/src/MobileMessageCallback.cpp index 1d7f13f35cd4..9d9f91227799 100644 --- a/dom/mobilemessage/src/MobileMessageCallback.cpp +++ b/dom/mobilemessage/src/MobileMessageCallback.cpp @@ -4,11 +4,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MobileMessageCallback.h" +#include "mozilla/dom/ToJSValue.h" #include "nsContentUtils.h" #include "nsCxPusher.h" #include "nsIDOMMozSmsMessage.h" #include "nsIDOMMozMmsMessage.h" -#include "nsIDOMSmsSegmentInfo.h" #include "nsIScriptGlobalObject.h" #include "nsPIDOMWindow.h" #include "MmsMessage.h" @@ -226,9 +226,28 @@ MobileMessageCallback::NotifyMarkMessageReadFailed(int32_t aError) } NS_IMETHODIMP -MobileMessageCallback::NotifySegmentInfoForTextGot(nsIDOMMozSmsSegmentInfo *aInfo) +MobileMessageCallback::NotifySegmentInfoForTextGot(int32_t aSegments, + int32_t aCharsPerSegment, + int32_t aCharsAvailableInLastSegment) { - return NotifySuccess(aInfo, true); + AutoJSAPI jsapi; + if (NS_WARN_IF(!jsapi.Init(mDOMRequest->GetOwner()))) { + return NotifyError(nsIMobileMessageCallback::INTERNAL_ERROR); + } + + SmsSegmentInfo info; + info.mSegments = aSegments; + info.mCharsPerSegment = aCharsPerSegment; + info.mCharsAvailableInLastSegment = aCharsAvailableInLastSegment; + + JSContext* cx = jsapi.cx(); + JS::Rooted val(cx); + if (!ToJSValue(cx, info, &val)) { + JS_ClearPendingException(cx); + return NotifyError(nsIMobileMessageCallback::INTERNAL_ERROR); + } + + return NotifySuccess(val, true); } NS_IMETHODIMP diff --git a/dom/mobilemessage/src/MobileMessageService.cpp b/dom/mobilemessage/src/MobileMessageService.cpp index 3bca72025d92..cb638eca4bfc 100644 --- a/dom/mobilemessage/src/MobileMessageService.cpp +++ b/dom/mobilemessage/src/MobileMessageService.cpp @@ -6,7 +6,6 @@ #include "MmsMessage.h" #include "MobileMessageThread.h" #include "MobileMessageService.h" -#include "SmsSegmentInfo.h" #include "DeletedMessageInfo.h" namespace mozilla { @@ -101,18 +100,6 @@ MobileMessageService::CreateMmsMessage(int32_t aId, aMessage); } -NS_IMETHODIMP -MobileMessageService::CreateSmsSegmentInfo(int32_t aSegments, - int32_t aCharsPerSegment, - int32_t aCharsAvailableInLastSegment, - nsIDOMMozSmsSegmentInfo** aSegmentInfo) -{ - nsCOMPtr info = - new SmsSegmentInfo(aSegments, aCharsPerSegment, aCharsAvailableInLastSegment); - info.forget(aSegmentInfo); - return NS_OK; -} - NS_IMETHODIMP MobileMessageService::CreateThread(uint64_t aId, JS::Handle aParticipants, diff --git a/dom/mobilemessage/src/SmsSegmentInfo.cpp b/dom/mobilemessage/src/SmsSegmentInfo.cpp deleted file mode 100644 index 2bb031ec8cc0..000000000000 --- a/dom/mobilemessage/src/SmsSegmentInfo.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "SmsSegmentInfo.h" -#include "nsIDOMClassInfo.h" - -using namespace mozilla::dom::mobilemessage; - -DOMCI_DATA(MozSmsSegmentInfo, mozilla::dom::SmsSegmentInfo) - -namespace mozilla { -namespace dom { - -NS_INTERFACE_MAP_BEGIN(SmsSegmentInfo) - NS_INTERFACE_MAP_ENTRY(nsIDOMMozSmsSegmentInfo) - NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozSmsSegmentInfo) -NS_INTERFACE_MAP_END - -NS_IMPL_ADDREF(SmsSegmentInfo) -NS_IMPL_RELEASE(SmsSegmentInfo) - -SmsSegmentInfo::SmsSegmentInfo(int32_t aSegments, - int32_t aCharsPerSegment, - int32_t aCharsAvailableInLastSegment) - : mData(aSegments, aCharsPerSegment, aCharsAvailableInLastSegment) -{ -} - -SmsSegmentInfo::SmsSegmentInfo(const SmsSegmentInfoData& aData) - : mData(aData) -{ -} - -NS_IMETHODIMP -SmsSegmentInfo::GetSegments(int32_t* aSegments) -{ - *aSegments = mData.segments(); - return NS_OK; -} - -NS_IMETHODIMP -SmsSegmentInfo::GetCharsPerSegment(int32_t* aCharsPerSegment) -{ - *aCharsPerSegment = mData.charsPerSegment(); - return NS_OK; -} - -NS_IMETHODIMP -SmsSegmentInfo::GetCharsAvailableInLastSegment(int32_t* aCharsAvailableInLastSegment) -{ - *aCharsAvailableInLastSegment = mData.charsAvailableInLastSegment(); - return NS_OK; -} - -const SmsSegmentInfoData& -SmsSegmentInfo::GetData() const -{ - return mData; -} - -} // namespace dom -} // namespace mozilla diff --git a/dom/mobilemessage/src/SmsSegmentInfo.h b/dom/mobilemessage/src/SmsSegmentInfo.h deleted file mode 100644 index 8740cac36883..000000000000 --- a/dom/mobilemessage/src/SmsSegmentInfo.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef mozilla_dom_mobilemessage_SmsSegmentInfo_h -#define mozilla_dom_mobilemessage_SmsSegmentInfo_h - -#include "nsIDOMSmsSegmentInfo.h" -#include "mozilla/Attributes.h" -#include "mozilla/dom/mobilemessage/SmsTypes.h" - -namespace mozilla { -namespace dom { - -class SmsSegmentInfo MOZ_FINAL : public nsIDOMMozSmsSegmentInfo -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_NSIDOMMOZSMSSEGMENTINFO - - SmsSegmentInfo(int32_t aSegments, - int32_t aCharsPerSegment, - int32_t aCharsAvailableInLastSegment); - - SmsSegmentInfo(const mobilemessage::SmsSegmentInfoData& aData); - - const mobilemessage::SmsSegmentInfoData& GetData() const; - -private: - ~SmsSegmentInfo() {} - - mobilemessage::SmsSegmentInfoData mData; -}; - -} // namespace dom -} // namespace mozilla - -#endif // mozilla_dom_mobilemessage_SmsSegmentInfo_h diff --git a/dom/mobilemessage/src/android/SmsService.cpp b/dom/mobilemessage/src/android/SmsService.cpp index ff383ea3aa68..3a169c57b0b6 100644 --- a/dom/mobilemessage/src/android/SmsService.cpp +++ b/dom/mobilemessage/src/android/SmsService.cpp @@ -5,7 +5,6 @@ #include "SmsMessage.h" #include "SmsService.h" -#include "SmsSegmentInfo.h" #include "AndroidBridge.h" namespace mozilla { diff --git a/dom/mobilemessage/src/gonk/SmsService.cpp b/dom/mobilemessage/src/gonk/SmsService.cpp index 14fb02dfbff1..2dc47e2ed0a0 100644 --- a/dom/mobilemessage/src/gonk/SmsService.cpp +++ b/dom/mobilemessage/src/gonk/SmsService.cpp @@ -5,7 +5,6 @@ #include "SmsMessage.h" #include "SmsService.h" -#include "SmsSegmentInfo.h" #include "mozilla/Preferences.h" #include "nsServiceManagerUtils.h" diff --git a/dom/mobilemessage/src/ipc/SmsChild.cpp b/dom/mobilemessage/src/ipc/SmsChild.cpp index d091f3c90d27..56b2552dbd91 100644 --- a/dom/mobilemessage/src/ipc/SmsChild.cpp +++ b/dom/mobilemessage/src/ipc/SmsChild.cpp @@ -5,7 +5,6 @@ #include "SmsChild.h" #include "SmsMessage.h" #include "MmsMessage.h" -#include "SmsSegmentInfo.h" #include "DeletedMessageInfo.h" #include "nsIObserverService.h" #include "mozilla/Services.h" @@ -246,10 +245,11 @@ SmsRequestChild::Recv__delete__(const MessageReply& aReply) mReplyRequest->NotifyMarkMessageReadFailed(aReply.get_ReplyMarkeMessageReadFail().error()); break; case MessageReply::TReplyGetSegmentInfoForText: { - const SmsSegmentInfoData& data = - aReply.get_ReplyGetSegmentInfoForText().infoData(); - nsCOMPtr info = new SmsSegmentInfo(data); - mReplyRequest->NotifySegmentInfoForTextGot(info); + const ReplyGetSegmentInfoForText& reply = + aReply.get_ReplyGetSegmentInfoForText(); + mReplyRequest->NotifySegmentInfoForTextGot(reply.segments(), + reply.charsPerSegment(), + reply.charsAvailableInLastSegment()); } break; case MessageReply::TReplyGetSegmentInfoForTextFail: diff --git a/dom/mobilemessage/src/ipc/SmsIPCService.cpp b/dom/mobilemessage/src/ipc/SmsIPCService.cpp index a8459d29a72b..cdca5b39245b 100644 --- a/dom/mobilemessage/src/ipc/SmsIPCService.cpp +++ b/dom/mobilemessage/src/ipc/SmsIPCService.cpp @@ -9,7 +9,6 @@ #include "mozilla/dom/mobilemessage/SmsChild.h" #include "SmsMessage.h" #include "SmsFilter.h" -#include "SmsSegmentInfo.h" #include "nsJSUtils.h" #include "nsCxPusher.h" #include "mozilla/dom/MozMobileMessageManagerBinding.h" diff --git a/dom/mobilemessage/src/ipc/SmsParent.cpp b/dom/mobilemessage/src/ipc/SmsParent.cpp index 4039021b4567..20d136797c71 100644 --- a/dom/mobilemessage/src/ipc/SmsParent.cpp +++ b/dom/mobilemessage/src/ipc/SmsParent.cpp @@ -15,7 +15,6 @@ #include "MmsMessage.h" #include "nsIMobileMessageDatabaseService.h" #include "SmsFilter.h" -#include "SmsSegmentInfo.h" #include "MobileMessageThread.h" #include "nsIDOMFile.h" #include "mozilla/dom/ipc/Blob.h" @@ -712,10 +711,13 @@ SmsRequestParent::NotifyMarkMessageReadFailed(int32_t aError) } NS_IMETHODIMP -SmsRequestParent::NotifySegmentInfoForTextGot(nsIDOMMozSmsSegmentInfo *aInfo) +SmsRequestParent::NotifySegmentInfoForTextGot(int32_t aSegments, + int32_t aCharsPerSegment, + int32_t aCharsAvailableInLastSegment) { - SmsSegmentInfo* info = static_cast(aInfo); - return SendReply(ReplyGetSegmentInfoForText(info->GetData())); + return SendReply(ReplyGetSegmentInfoForText(aSegments, + aCharsPerSegment, + aCharsAvailableInLastSegment)); } NS_IMETHODIMP diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index c45ac80dc09c..d889facc77a9 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -42,7 +42,6 @@ EXPORTS.mozilla.dom += [ 'MobileMessageManager.h', 'SmsFilter.h', 'SmsMessage.h', - 'SmsSegmentInfo.h', ] UNIFIED_SOURCES += [ @@ -60,7 +59,6 @@ UNIFIED_SOURCES += [ 'MobileMessageThread.cpp', 'SmsFilter.cpp', 'SmsMessage.cpp', - 'SmsSegmentInfo.cpp', 'SmsServicesFactory.cpp', ] diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index 7f856f1e30be..088ee856ce5d 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -4240,11 +4240,9 @@ RadioInterface.prototype = { charsInLastSegment = 0; } - let result = gMobileMessageService - .createSmsSegmentInfo(options.segmentMaxSeq, - options.segmentChars, - options.segmentChars - charsInLastSegment); - request.notifySegmentInfoForTextGot(result); + request.notifySegmentInfoForTextGot(options.segmentMaxSeq, + options.segmentChars, + options.segmentChars - charsInLastSegment); }, getSmscAddress: function(request) { From 2b819372e99cec5388553aed109d0b6555990f31 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Mon, 4 Aug 2014 17:01:36 +0800 Subject: [PATCH 07/14] Bug 916607 - 3/4: android backend. r=blassey --- widget/android/AndroidBridge.cpp | 17 +++++++---------- widget/android/AndroidBridge.h | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 3db4981a9eb6..79aa8fda7dbb 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -1065,11 +1065,7 @@ AndroidBridge::GetSegmentInfoForText(const nsAString& aText, #else ALOG_BRIDGE("AndroidBridge::GetSegmentInfoForText"); - dom::mobilemessage::SmsSegmentInfoData data; - - data.segments() = 0; - data.charsPerSegment() = 0; - data.charsAvailableInLastSegment() = 0; + int32_t segments, charsPerSegment, charsAvailableInLastSegment; JNIEnv *env = GetJNIEnv(); @@ -1086,17 +1082,18 @@ AndroidBridge::GetSegmentInfoForText(const nsAString& aText, jint* info = env->GetIntArrayElements(arr, JNI_FALSE); - data.segments() = info[0]; // msgCount - data.charsPerSegment() = info[2]; // codeUnitsRemaining + segments = info[0]; // msgCount + charsPerSegment = info[2]; // codeUnitsRemaining // segmentChars = (codeUnitCount + codeUnitsRemaining) / msgCount - data.charsAvailableInLastSegment() = (info[1] + info[2]) / info[0]; + charsAvailableInLastSegment = (info[1] + info[2]) / info[0]; env->ReleaseIntArrayElements(arr, info, JNI_ABORT); // TODO Bug 908598 - Should properly use |QueueSmsRequest(...)| to queue up // the nsIMobileMessageCallback just like other functions. - nsCOMPtr info = new SmsSegmentInfo(data); - return aRequest->NotifySegmentInfoForTextGot(info); + return aRequest->NotifySegmentInfoForTextGot(segments, + charsPerSegment, + charsAvailableInLastSegment); #endif } diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h index 5826c7f5387c..33b9eb2b2bc1 100644 --- a/widget/android/AndroidBridge.h +++ b/widget/android/AndroidBridge.h @@ -59,7 +59,6 @@ class NetworkInformation; namespace dom { namespace mobilemessage { struct SmsFilterData; -struct SmsSegmentInfoData; } // namespace mobilemessage } // namespace dom From ccaa9e46b4282e2c5679157681e955570697ed69 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Mon, 4 Aug 2014 17:01:37 +0800 Subject: [PATCH 08/14] Bug 916607 - 4/4: fix test cases. r=bzbarsky, r=gene --- dom/mobilemessage/tests/marionette/head.js | 1 + .../marionette/test_getsegmentinfofortext.js | 121 ++------ .../tests/marionette/test_incoming_delete.js | 2 +- .../test_massive_incoming_delete.js | 2 +- .../tests/marionette/test_segment_info.js | 258 +++++++----------- .../mochitest/general/test_interfaces.html | 2 - 6 files changed, 130 insertions(+), 256 deletions(-) diff --git a/dom/mobilemessage/tests/marionette/head.js b/dom/mobilemessage/tests/marionette/head.js index 0483ac2d6ae9..b62c17a993cd 100644 --- a/dom/mobilemessage/tests/marionette/head.js +++ b/dom/mobilemessage/tests/marionette/head.js @@ -22,6 +22,7 @@ function pushPrefEnv(aPrefs) { let deferred = Promise.defer(); SpecialPowers.pushPrefEnv(aPrefs, function() { + ok(true, "preferences pushed: " + JSON.stringify(aPrefs)); deferred.resolve(); }); diff --git a/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js b/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js index cea168b8ba27..8803e8ee2c93 100644 --- a/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js +++ b/dom/mobilemessage/tests/marionette/test_getsegmentinfofortext.js @@ -2,111 +2,48 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = 'head.js'; // Copied from dom/system/gonk/ril_consts.js. const PDU_MAX_USER_DATA_7BIT = 160; -SpecialPowers.setBoolPref("dom.sms.enabled", true); -SpecialPowers.addPermission("sms", true, document); +function test(text, segments, charsPerSegment, charsAvailableInLastSegment) { + log("Testing '" + text + "' ..."); -let manager = window.navigator.mozMobileMessage; -ok(manager instanceof MozMobileMessageManager, - "manager is instance of " + manager.constructor); + let domRequest = manager.getSegmentInfoForText(text); + ok(domRequest, "DOMRequest object returned."); -let tasks = { - // List of test fuctions. Each of them should call |tasks.next()| when - // completed or |tasks.finish()| to jump to the last one. - _tasks: [], - _nextTaskIndex: 0, + return wrapDomRequestAsPromise(domRequest) + .then(function(aEvent) { + let result = aEvent.target.result; + ok(result, "aEvent.target.result = " + JSON.stringify(result)); - push: function(func) { - this._tasks.push(func); - }, - - next: function() { - let index = this._nextTaskIndex++; - let task = this._tasks[index]; - try { - task(); - } catch (ex) { - ok(false, "test task[" + index + "] throws: " + ex); - // Run last task as clean up if possible. - if (index != this._tasks.length - 1) { - this.finish(); - } - } - }, - - finish: function() { - this._tasks[this._tasks.length - 1](); - }, - - run: function() { - this.next(); - } -}; - -function addTest(text, segments, charsPerSegment, charsAvailableInLastSegment) { - tasks.push(function() { - log("Testing '" + text + "' ..."); - let domRequest = manager.getSegmentInfoForText(text); - ok(domRequest, "DOMRequest object returned."); - - domRequest.onsuccess = function(e) { - log("Received 'onsuccess' DOMRequest event."); - - let result = e.target.result; - if (!result) { - ok(false, "getSegmentInfoForText() result is not valid."); - tasks.finish(); - return; - } - - is(result.segments, segments, "info.segments"); - is(result.charsPerSegment, charsPerSegment, "info.charsPerSegment"); + is(result.segments, segments, "result.segments"); + is(result.charsPerSegment, charsPerSegment, "result.charsPerSegment"); is(result.charsAvailableInLastSegment, charsAvailableInLastSegment, - "info.charsAvailableInLastSegment"); - - tasks.next(); - }; - - domRequest.onerror = function(e) { - ok(false, "Failed to call getSegmentInfoForText()."); - tasks.finish(); - }; - }); + "result.charsAvailableInLastSegment"); + }); } -addTest(null, 1, PDU_MAX_USER_DATA_7BIT, - PDU_MAX_USER_DATA_7BIT - "null".length); +startTestCommon(function() { + // Ensure we always begin with strict 7bit encoding set to false. + return pushPrefEnv({ set: [["dom.sms.strict7BitEncoding", false]] }) -// Testing "undefined". -addTest(undefined, 1, PDU_MAX_USER_DATA_7BIT, - PDU_MAX_USER_DATA_7BIT - "undefined".length); + .then(() => test(null, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - "null".length))) + .then(() => test(undefined, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - "undefined".length))) -// Testing numeric values. -addTest(0, 1, PDU_MAX_USER_DATA_7BIT, PDU_MAX_USER_DATA_7BIT - "0".length); -addTest(1.0, 1, PDU_MAX_USER_DATA_7BIT, PDU_MAX_USER_DATA_7BIT - "1".length); + .then(() => test(0, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - "0".length))) + .then(() => test(1.0, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - "1".length))) -// Testing empty object. The empty object extends to "[object Object]" and both -// '[' and ']' are in default single shift table, so each of them takes two -// septets. -addTest({}, 1, PDU_MAX_USER_DATA_7BIT, - PDU_MAX_USER_DATA_7BIT - (("" + {}).length + 2)); + // Testing empty object. The empty object extends to "[object Object]" and + // both '[' and ']' are in default single shift table, so each of them + // takes two septets. + .then(() => test({}, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - (("" + {}).length + 2)))) -// Testing Date object. -let date = new Date(); -addTest(date, 1, PDU_MAX_USER_DATA_7BIT, - PDU_MAX_USER_DATA_7BIT - ("" + date).length); + .then(function() { + let date = new Date(); + return test(date, 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - ("" + date).length)); + }) -addTest("", 1, PDU_MAX_USER_DATA_7BIT, - PDU_MAX_USER_DATA_7BIT - "".length); - -// WARNING: All tasks should be pushed before this!!! -tasks.push(function cleanUp() { - SpecialPowers.removePermission("sms", document); - SpecialPowers.clearUserPref("dom.sms.enabled"); - finish(); + .then(() => test("", 1, PDU_MAX_USER_DATA_7BIT, (PDU_MAX_USER_DATA_7BIT - "".length))); }); - -tasks.run(); diff --git a/dom/mobilemessage/tests/marionette/test_incoming_delete.js b/dom/mobilemessage/tests/marionette/test_incoming_delete.js index d6f504f37da0..1a04064a1f27 100644 --- a/dom/mobilemessage/tests/marionette/test_incoming_delete.js +++ b/dom/mobilemessage/tests/marionette/test_incoming_delete.js @@ -130,7 +130,7 @@ function verifySmsDeleted(smsId) { function cleanUp() { manager.onreceived = null; SpecialPowers.removePermission("sms", document); - SpecialPowers.setBoolPref("dom.sms.enabled", false); + SpecialPowers.clearUserPref("dom.sms.enabled"); finish(); } diff --git a/dom/mobilemessage/tests/marionette/test_massive_incoming_delete.js b/dom/mobilemessage/tests/marionette/test_massive_incoming_delete.js index c367cad63c85..8be6ad53ff6d 100644 --- a/dom/mobilemessage/tests/marionette/test_massive_incoming_delete.js +++ b/dom/mobilemessage/tests/marionette/test_massive_incoming_delete.js @@ -208,7 +208,7 @@ tasks.push(function cleanUp() { manager.onreceived = null; SpecialPowers.removePermission("sms", document); - SpecialPowers.setBoolPref("dom.sms.enabled", false); + SpecialPowers.clearUserPref("dom.sms.enabled"); log("Finish!!!"); finish(); }); diff --git a/dom/mobilemessage/tests/marionette/test_segment_info.js b/dom/mobilemessage/tests/marionette/test_segment_info.js index b6ad0eb4f60c..3f690695d39e 100644 --- a/dom/mobilemessage/tests/marionette/test_segment_info.js +++ b/dom/mobilemessage/tests/marionette/test_segment_info.js @@ -2,6 +2,7 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = 'head.js'; const LEN_7BIT = 160; const LEN_7BIT_WITH_8BIT_REF = 153; @@ -10,179 +11,116 @@ const LEN_UCS2 = 70; const LEN_UCS2_WITH_8BIT_REF = 67; const LEN_UCS2_WITH_16BIT_REF = 66; -SpecialPowers.setBoolPref("dom.sms.enabled", true); -let currentStrict7BitEncoding = false; -SpecialPowers.setBoolPref("dom.sms.strict7BitEncoding", - currentStrict7BitEncoding); -SpecialPowers.addPermission("sms", true, document); - -let manager = window.navigator.mozMobileMessage; -ok(manager instanceof MozMobileMessageManager, - "manager is instance of " + manager.constructor); - function times(str, n) { return (new Array(n + 1)).join(str); } -let tasks = { - // List of test fuctions. Each of them should call |tasks.next()| when - // completed or |tasks.finish()| to jump to the last one. - _tasks: [], - _nextTaskIndex: 0, +function test(text, segments, charsPerSegment, charsAvailableInLastSegment) { + // 'text' may contain non-ascii characters, so we're not going to print it on + // Marionette console to avoid breaking it. + ok(true, "Testing '" + text + "' ..."); - push: function(func) { - this._tasks.push(func); - }, + let domRequest = manager.getSegmentInfoForText(text); + ok(domRequest, "DOMRequest object returned."); - next: function() { - let index = this._nextTaskIndex++; - let task = this._tasks[index]; - try { - task(); - } catch (ex) { - ok(false, "test task[" + index + "] throws: " + ex); - // Run last task as clean up if possible. - if (index != this._tasks.length - 1) { - this.finish(); - } - } - }, + return wrapDomRequestAsPromise(domRequest) + .then(function(aEvent) { + let result = aEvent.target.result; + ok(result, "aEvent.target.result = " + JSON.stringify(result)); - finish: function() { - this._tasks[this._tasks.length - 1](); - }, - - run: function() { - this.next(); - } -}; - -function addTest(text, strict7BitEncoding, expected) { - tasks.push(function() { - if (strict7BitEncoding != currentStrict7BitEncoding) { - currentStrict7BitEncoding = strict7BitEncoding; - SpecialPowers.setBoolPref("dom.sms.strict7BitEncoding", - currentStrict7BitEncoding); - } - - let domRequest = manager.getSegmentInfoForText(text); - ok(domRequest, "DOMRequest object returned."); - - domRequest.onsuccess = function(e) { - log("Received 'onsuccess' DOMRequest event."); - - let result = e.target.result; - if (!result) { - ok(false, "getSegmentInfoForText() result is not valid."); - tasks.finish(); - return; - } - - is(result.segments, expected[0], "segments"); - is(result.charsPerSegment, expected[1], "charsPerSegment"); - is(result.charsAvailableInLastSegment, expected[2], - "charsAvailableInLastSegment"); - - tasks.next(); - }; - - domRequest.onerror = function(e) { - ok(false, "Failed to call getSegmentInfoForText()."); - tasks.finish(); - }; - }); + is(result.segments, segments, "result.segments"); + is(result.charsPerSegment, charsPerSegment, "result.charsPerSegment"); + is(result.charsAvailableInLastSegment, charsAvailableInLastSegment, + "result.charsAvailableInLastSegment"); + }); } -// GSM 7Bit Alphabets: -// -// 'a' is in GSM default locking shift table, so it takes 1 septet. -addTest("a", false, [1, LEN_7BIT, LEN_7BIT - 1]); -// '\u20ac' is in GSM default single shift table, so it takes 2 septets. -addTest("\u20ac", false, [1, LEN_7BIT, LEN_7BIT - 2]); -// SP is defined in both locking shift and single shift tables. -addTest(" ", false, [1, LEN_7BIT, LEN_7BIT - 1]); -// Some combinations. -addTest("a\u20ac", false, [1, LEN_7BIT, LEN_7BIT - 3]); -addTest("a ", false, [1, LEN_7BIT, LEN_7BIT - 2]); -addTest("\u20aca", false, [1, LEN_7BIT, LEN_7BIT - 3]); -addTest("\u20ac ", false, [1, LEN_7BIT, LEN_7BIT - 3]); -addTest(" \u20ac", false, [1, LEN_7BIT, LEN_7BIT - 3]); -addTest(" a", false, [1, LEN_7BIT, LEN_7BIT - 2]); +startTestCommon(function() { + // Ensure we always begin with strict 7bit encoding set to false. + return pushPrefEnv({ set: [["dom.sms.strict7BitEncoding", false]] }) -// GSM 7Bit Alphabets (multipart): -// -// Exactly 160 locking shift table chararacters. -addTest(times("a", LEN_7BIT), false, [1, LEN_7BIT, 0]); -// 161 locking shift table chararacters. We'll have |161 - 153 = 8| septets in -// the 2nd segment. -addTest(times("a", LEN_7BIT + 1), false, - [2, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 8]); -// |LEN_7BIT_WITH_8BIT_REF * 2| locking shift table chararacters. -addTest(times("a", LEN_7BIT_WITH_8BIT_REF * 2), false, - [2, LEN_7BIT_WITH_8BIT_REF, 0]); -// |LEN_7BIT_WITH_8BIT_REF * 2 + 1| locking shift table chararacters. -addTest(times("a", LEN_7BIT_WITH_8BIT_REF * 2 + 1), false, - [3, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 1]); -// Exactly 80 single shift table chararacters. -addTest(times("\u20ac", LEN_7BIT / 2), false, [1, LEN_7BIT, 0]); -// 81 single shift table chararacters. Because |Math.floor(153 / 2) = 76|, it -// should left 5 septets in the 2nd segment. -addTest(times("\u20ac", LEN_7BIT / 2 + 1), false, - [2, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 10]); -// |1 + 2 * 76| single shift table chararacters. We have only |153 - 76 * 2 = 1| -// space left, but each single shift table character takes 2, so it will be -// filled in the 3rd segment. -addTest(times("\u20ac", 1 + 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)), false, - [3, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 2]); -// |2 * 76| single shift table chararacters + 1 locking shift table chararacter. -addTest("a" + times("\u20ac", 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)), false, - [2, LEN_7BIT_WITH_8BIT_REF, 1]); -addTest(times("\u20ac", 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)) + "a", false, - [2, LEN_7BIT_WITH_8BIT_REF, 0]); + // GSM 7Bit Alphabets: + // + // 'a' is in GSM default locking shift table, so it takes 1 septet. + .then(() => test("a", 1, LEN_7BIT, LEN_7BIT - 1)) + // '\u20ac' is in GSM default single shift table, so it takes 2 septets. + .then(() => test("\u20ac", 1, LEN_7BIT, LEN_7BIT - 2)) + // SP is defined in both locking shift and single shift tables. + .then(() => test(" ", 1, LEN_7BIT, LEN_7BIT - 1)) + // Some combinations. + .then(() => test("a\u20ac", 1, LEN_7BIT, LEN_7BIT - 3)) + .then(() => test("a ", 1, LEN_7BIT, LEN_7BIT - 2)) + .then(() => test("\u20aca", 1, LEN_7BIT, LEN_7BIT - 3)) + .then(() => test("\u20ac ", 1, LEN_7BIT, LEN_7BIT - 3)) + .then(() => test(" \u20ac", 1, LEN_7BIT, LEN_7BIT - 3)) + .then(() => test(" a", 1, LEN_7BIT, LEN_7BIT - 2)) -// UCS2: -// -// '\u6afb' should be encoded as UCS2. -addTest("\u6afb", false, [1, LEN_UCS2, LEN_UCS2 - 1]); -// Combination of GSM 7bit alphabets. -addTest("\u6afba", false, [1, LEN_UCS2, LEN_UCS2 - 2]); -addTest("\u6afb\u20ac", false, [1, LEN_UCS2, LEN_UCS2 - 2]); -addTest("\u6afb ", false, [1, LEN_UCS2, LEN_UCS2 - 2]); + // GSM 7Bit Alphabets (multipart): + // + // Exactly 160 locking shift table chararacters. + .then(() => test(times("a", LEN_7BIT), 1, LEN_7BIT, 0)) + // 161 locking shift table chararacters. We'll have |161 - 153 = 8| septets in + // the 2nd segment. + .then(() => test(times("a", LEN_7BIT + 1), + 2, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 8)) + // |LEN_7BIT_WITH_8BIT_REF * 2| locking shift table chararacters. + .then(() => test(times("a", LEN_7BIT_WITH_8BIT_REF * 2), + 2, LEN_7BIT_WITH_8BIT_REF, 0)) + // |LEN_7BIT_WITH_8BIT_REF * 2 + 1| locking shift table chararacters. + .then(() => test(times("a", LEN_7BIT_WITH_8BIT_REF * 2 + 1), + 3, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 1)) + // Exactly 80 single shift table chararacters. + .then(() => test(times("\u20ac", LEN_7BIT / 2), 1, LEN_7BIT, 0)) + // 81 single shift table chararacters. Because |Math.floor(153 / 2) = 76|, it + // should left 5 septets in the 2nd segment. + .then(() => test(times("\u20ac", LEN_7BIT / 2 + 1), + 2, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 10)) + // |1 + 2 * 76| single shift table chararacters. We have only |153 - 76 * 2 = 1| + // space left, but each single shift table character takes 2, so it will be + // filled in the 3rd segment. + .then(() => test(times("\u20ac", 1 + 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)), + 3, LEN_7BIT_WITH_8BIT_REF, LEN_7BIT_WITH_8BIT_REF - 2)) + // |2 * 76| single shift table chararacters + 1 locking shift table chararacter. + .then(() => test("a" + times("\u20ac", 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)), + 2, LEN_7BIT_WITH_8BIT_REF, 1)) + .then(() => test(times("\u20ac", 2 * Math.floor(LEN_7BIT_WITH_8BIT_REF / 2)) + "a", + 2, LEN_7BIT_WITH_8BIT_REF, 0)) -// UCS2 (multipart): -// -// Exactly 70 UCS2 chararacters. -addTest(times("\u6afb", LEN_UCS2), false, [1, LEN_UCS2, 0]); -// 71 UCS2 chararacters. We'll have |71 - 67 = 4| chararacters in the 2nd -// segment. -addTest(times("\u6afb", LEN_UCS2 + 1), false, - [2, LEN_UCS2_WITH_8BIT_REF, LEN_UCS2_WITH_8BIT_REF - 4]); -// |LEN_UCS2_WITH_8BIT_REF * 2| ucs2 chararacters. -addTest(times("\u6afb", LEN_UCS2_WITH_8BIT_REF * 2), false, - [2, LEN_UCS2_WITH_8BIT_REF, 0]); -// |LEN_7BIT_WITH_8BIT_REF * 2 + 1| ucs2 chararacters. -addTest(times("\u6afb", LEN_UCS2_WITH_8BIT_REF * 2 + 1), false, - [3, LEN_UCS2_WITH_8BIT_REF, LEN_UCS2_WITH_8BIT_REF - 1]); + // UCS2: + // + // '\u6afb' should be encoded as UCS2. + .then(() => test("\u6afb", 1, LEN_UCS2, LEN_UCS2 - 1)) + // Combination of GSM 7bit alphabets. + .then(() => test("\u6afba", 1, LEN_UCS2, LEN_UCS2 - 2)) + .then(() => test("\u6afb\u20ac", 1, LEN_UCS2, LEN_UCS2 - 2)) + .then(() => test("\u6afb ", 1, LEN_UCS2, LEN_UCS2 - 2)) -// Strict 7-Bit Encoding: -// -// Should have no effect on GSM default alphabet characters. -addTest("\u0041", true, [1, LEN_7BIT, LEN_7BIT - 1]); -// "\u00c0"(À) should be mapped to "\u0041"(A). -addTest("\u00c0", true, [1, LEN_7BIT, LEN_7BIT - 1]); -// Mixing mapped characters with unmapped ones. -addTest("\u00c0\u0041", true, [1, LEN_7BIT, LEN_7BIT - 2]); -addTest("\u0041\u00c0", true, [1, LEN_7BIT, LEN_7BIT - 2]); -// UCS2 characters should be mapped to '*'. -addTest("\u1234", true, [1, LEN_7BIT, LEN_7BIT - 1]); + // UCS2 (multipart): + // + // Exactly 70 UCS2 chararacters. + .then(() => test(times("\u6afb", LEN_UCS2), 1, LEN_UCS2, 0)) + // 71 UCS2 chararacters. We'll have |71 - 67 = 4| chararacters in the 2nd + // segment. + .then(() => test(times("\u6afb", LEN_UCS2 + 1), + 2, LEN_UCS2_WITH_8BIT_REF, LEN_UCS2_WITH_8BIT_REF - 4)) + // |LEN_UCS2_WITH_8BIT_REF * 2| ucs2 chararacters. + .then(() => test(times("\u6afb", LEN_UCS2_WITH_8BIT_REF * 2), + 2, LEN_UCS2_WITH_8BIT_REF, 0)) + // |LEN_7BIT_WITH_8BIT_REF * 2 + 1| ucs2 chararacters. + .then(() => test(times("\u6afb", LEN_UCS2_WITH_8BIT_REF * 2 + 1), + 3, LEN_UCS2_WITH_8BIT_REF, LEN_UCS2_WITH_8BIT_REF - 1)) + // Strict 7-Bit Encoding: + // + .then(() => pushPrefEnv({ set: [["dom.sms.strict7BitEncoding", true]] })) -// WARNING: All tasks should be pushed before this!!! -tasks.push(function cleanUp() { - SpecialPowers.removePermission("sms", document); - SpecialPowers.clearUserPref("dom.sms.enabled"); - SpecialPowers.clearUserPref("dom.sms.strict7BitEncoding"); - finish(); + // Should have no effect on GSM default alphabet characters. + .then(() => test("\u0041", 1, LEN_7BIT, LEN_7BIT - 1)) + // "\u00c0"(À) should be mapped to "\u0041"(A). + .then(() => test("\u00c0", 1, LEN_7BIT, LEN_7BIT - 1)) + // Mixing mapped characters with unmapped ones. + .then(() => test("\u00c0\u0041", 1, LEN_7BIT, LEN_7BIT - 2)) + .then(() => test("\u0041\u00c0", 1, LEN_7BIT, LEN_7BIT - 2)) + // UCS2 characters should be mapped to '*'. + .then(() => test("\u1234", 1, LEN_7BIT, LEN_7BIT - 1)); }); - -tasks.run(); diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index a4173c04f3c0..e3aa55e27e30 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -707,8 +707,6 @@ var interfaceNamesInGlobalScope = "MozSmsFilter", // IMPORTANT: Do not change this list without review from a DOM peer! "MozSmsMessage", -// IMPORTANT: Do not change this list without review from a DOM peer! - "MozSmsSegmentInfo", // IMPORTANT: Do not change this list without review from a DOM peer! {name: "MozSpeakerManager", b2g: true}, // IMPORTANT: Do not change this list without review from a DOM peer! From 29883f0a8c450337b03f6ff328febbc265c5a040 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:20:33 -0700 Subject: [PATCH 09/14] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/15a76be03f01 Author: Timothy Guan-tin Chien Desc: Merge pull request #22470 from timdream/keyboard-latin-new-uint8 Bug 1048135 - Add new keyword on Uint8Array instance creation, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/d5235d201196 Author: Timothy Guan-tin Chien Desc: Bug 1048135 - Add new keyword on Uint8Array instance creation ======== https://hg.mozilla.org/integration/gaia-central/rev/17de4b2606e5 Author: Timothy Guan-tin Chien Desc: Merge pull request #22474 from mozilla-b2g/revert-22461-keyboard-vwrapper-css Revert "Bug 1048025 - Set pointer-events: none to visual-wrapper" ======== https://hg.mozilla.org/integration/gaia-central/rev/0ceb9239e8b2 Author: Timothy Guan-tin Chien Desc: Revert "Bug 1048025 - Set pointer-events: none to visual-wrapper +shepherd" --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c5dac29f5c2b..932e1a42cc12 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "5ac5df7f279b1548965362289c6bb393a8dda942", + "revision": "15a76be03f0177d14b2dbc2126240058e3ddc12e", "repo_path": "/integration/gaia-central" } From 08dae0ce13d20f23a67e60d0d6035a0df4777d4f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:22:05 -0700 Subject: [PATCH 10/14] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 65824651d014..49bc994c1a1d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0e2569b17597..3c51c9742b69 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f0f3895b3b48..b96519ac9699 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 65824651d014..49bc994c1a1d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 76d21e2e5dc4..80e453466ed0 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1a9b9b34b5e3..26030d6e718f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e2a9a302117b..4b17168aff5f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 048a4fa25259..ea27b7e73f5e 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index cc881c565804..0bcb248fb62e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 90c35329015eb63ec46bf29cce874cfa50f691f0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:35:32 -0700 Subject: [PATCH 11/14] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c53fd3d63006 Author: Julien Wajsberg Desc: Revert "Merge pull request #22398 from evanxd/bug-1047292" This reverts commit 9ef7ee6031c4a7a6e2c6d9e018066a5ae484d3fc, reversing changes made to eae74908a7ab8493691b7fc6ec91d969821d9798. ======== https://hg.mozilla.org/integration/gaia-central/rev/522c7f570ced Author: Rudy Lu Desc: Merge pull request #22347 from RudyLu/keyboard/bug1046061-multiple_symbol_pages_2 Bug 1046061 - Make pinyin levarge the original page switching functions. r=timdream, luke-chang. ======== https://hg.mozilla.org/integration/gaia-central/rev/a1b2d095a5bb Author: Rudy Lu Desc: Bug 1046061 - Make pinyin levarge the original page switching functions. - Use keycode 65 to represent "'" so that pinyin won't have to know which page it is in. ======== https://hg.mozilla.org/integration/gaia-central/rev/62dbf50a297d Author: gitmai Desc: Merge pull request #22407 from gitmai/bug-1044299-CC-rtl-fixes Bug 1044299 - [RTL][Usage][Cost Control] Cost Control app/Usage app need... r=salva ======== https://hg.mozilla.org/integration/gaia-central/rev/70184f4764b8 Author: mai Desc: Bug 1044299 - [RTL][Usage][Cost Control] Cost Control app/Usage app needs to have RTL taken into account --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 932e1a42cc12..e896fed6801e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "15a76be03f0177d14b2dbc2126240058e3ddc12e", + "revision": "c53fd3d630066c4ff80cfd34eaa0243838175874", "repo_path": "/integration/gaia-central" } From 435f913b610742d3be33f0cff9c324e486d5db3b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:41:17 -0700 Subject: [PATCH 12/14] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 49bc994c1a1d..623e72b3504b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3c51c9742b69..96c06cd20925 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b96519ac9699..04088b323e09 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 49bc994c1a1d..623e72b3504b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 80e453466ed0..50b4443a6440 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 26030d6e718f..faceedcc3121 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 4b17168aff5f..80129dd4f266 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ea27b7e73f5e..abb140ad0460 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 0bcb248fb62e..9eb818ae8505 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 62120172883ddc90662dd7a3e36c86a893d42a3c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:50:32 -0700 Subject: [PATCH 13/14] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/043ae63fa3ea Author: EragonJ Desc: Revert "Merge pull request #22093 from EragonJ/bug-1034560" This reverts commit 31285b589c888d568499e3ded096210b2a578729, reversing changes made to 5199de33170efe8ae73e67ec82a126a7d74dbd62. ======== https://hg.mozilla.org/integration/gaia-central/rev/21834777da64 Author: steveck-chung Desc: Merge pull request #22206 from gitmai/bug-990962-mms-are-not-correctly-shown Bug 990962 - [zte openc 1.3]Slides of MMS are not correctly shown. r=steveck-chung ======== https://hg.mozilla.org/integration/gaia-central/rev/432f815c0aa8 Author: mai Desc: Bug 990962 - [zte openc 1.3]Slides of MMS are not correctly shown --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e896fed6801e..5bf9db948a5a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c53fd3d630066c4ff80cfd34eaa0243838175874", + "revision": "043ae63fa3eac2eb69342ebe42d2a263065b3bdc", "repo_path": "/integration/gaia-central" } From ad34e3d539c708add32df315ea25b477ede78f79 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 4 Aug 2014 02:56:43 -0700 Subject: [PATCH 14/14] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 623e72b3504b..22c6635a9123 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 96c06cd20925..8f6788ff2078 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 04088b323e09..be8c80d35602 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 623e72b3504b..22c6635a9123 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 50b4443a6440..e0d7f8cbe4e7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index faceedcc3121..c0ace6929157 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 80129dd4f266..6583a8219a9f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index abb140ad0460..ee1485f3acb3 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 9eb818ae8505..6caa94fac8a4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +