mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset 94f875f9a8de (bug 921918) Windows XP Debug Bustage on a CLOSED TREE
This commit is contained in:
parent
fa9c72b064
commit
423e11da88
@ -771,8 +771,6 @@ GK_ATOM(onpopuphiding, "onpopuphiding")
|
||||
GK_ATOM(onpopupshowing, "onpopupshowing")
|
||||
GK_ATOM(onpopupshown, "onpopupshown")
|
||||
GK_ATOM(onradiostatechange, "onradiostatechange")
|
||||
GK_ATOM(onreaderror, "onreaderror")
|
||||
GK_ATOM(onreadsuccess, "onreadsuccess")
|
||||
GK_ATOM(onreadystatechange, "onreadystatechange")
|
||||
GK_ATOM(onreceived, "onreceived")
|
||||
GK_ATOM(onremoteheld, "onremoteheld")
|
||||
|
@ -74,9 +74,6 @@ this.SystemMessagePermissionsTable = {
|
||||
"sms-delivery-success": {
|
||||
"sms": []
|
||||
},
|
||||
"sms-read-success": {
|
||||
"sms": []
|
||||
},
|
||||
"sms-received": {
|
||||
"sms": []
|
||||
},
|
||||
|
@ -15,8 +15,6 @@ const char* kSmsFailedObserverTopic = "sms-failed";
|
||||
const char* kSmsDeliverySuccessObserverTopic = "sms-delivery-success";
|
||||
const char* kSmsDeliveryErrorObserverTopic = "sms-delivery-error";
|
||||
const char* kSilentSmsReceivedObserverTopic = "silent-sms-received";
|
||||
const char* kSmsReadSuccessObserverTopic = "sms-read-success";
|
||||
const char* kSmsReadErrorObserverTopic = "sms-read-error";
|
||||
|
||||
} // namespace mobilemessage
|
||||
} // namespace dom
|
||||
|
@ -19,8 +19,6 @@ extern const char* kSmsFailedObserverTopic;
|
||||
extern const char* kSmsDeliverySuccessObserverTopic;
|
||||
extern const char* kSmsDeliveryErrorObserverTopic;
|
||||
extern const char* kSilentSmsReceivedObserverTopic;
|
||||
extern const char* kSmsReadSuccessObserverTopic;
|
||||
extern const char* kSmsReadErrorObserverTopic;
|
||||
|
||||
#define DELIVERY_RECEIVED NS_LITERAL_STRING("received")
|
||||
#define DELIVERY_SENDING NS_LITERAL_STRING("sending")
|
||||
@ -35,11 +33,6 @@ extern const char* kSmsReadErrorObserverTopic;
|
||||
#define DELIVERY_STATUS_REJECTED NS_LITERAL_STRING("rejected")
|
||||
#define DELIVERY_STATUS_MANUAL NS_LITERAL_STRING("manual")
|
||||
|
||||
#define READ_STATUS_NOT_APPLICABLE NS_LITERAL_STRING("not-applicable")
|
||||
#define READ_STATUS_SUCCESS NS_LITERAL_STRING("success")
|
||||
#define READ_STATUS_PENDING NS_LITERAL_STRING("pending")
|
||||
#define READ_STATUS_ERROR NS_LITERAL_STRING("error")
|
||||
|
||||
#define MESSAGE_CLASS_NORMAL NS_LITERAL_STRING("normal")
|
||||
#define MESSAGE_CLASS_CLASS_0 NS_LITERAL_STRING("class-0")
|
||||
#define MESSAGE_CLASS_CLASS_1 NS_LITERAL_STRING("class-1")
|
||||
|
@ -145,40 +145,6 @@ MmsMessage::MmsMessage(const mobilemessage::MmsMessageData& aData)
|
||||
}
|
||||
}
|
||||
|
||||
// Prepare |info.readStatus|.
|
||||
nsString statusReadString;
|
||||
switch(infoData.readStatus()) {
|
||||
case eReadStatus_NotApplicable:
|
||||
statusReadString = READ_STATUS_NOT_APPLICABLE;
|
||||
break;
|
||||
case eReadStatus_Success:
|
||||
statusReadString = READ_STATUS_SUCCESS;
|
||||
break;
|
||||
case eReadStatus_Pending:
|
||||
statusReadString = READ_STATUS_PENDING;
|
||||
break;
|
||||
case eReadStatus_Error:
|
||||
statusReadString = READ_STATUS_ERROR;
|
||||
break;
|
||||
case eReadStatus_EndGuard:
|
||||
default:
|
||||
MOZ_CRASH("We shouldn't get any other read status!");
|
||||
}
|
||||
info.readStatus = statusReadString;
|
||||
|
||||
// Prepare |info.readTimestamp|.
|
||||
info.readTimestamp = JSVAL_NULL;
|
||||
if (infoData.readTimestamp() != 0) {
|
||||
AutoJSContext cx;
|
||||
JS::Rooted<JSObject*>
|
||||
dateObj(cx, JS_NewDateObjectMsec(cx, infoData.readTimestamp()));
|
||||
if (!dateObj) {
|
||||
NS_WARNING("MmsMessage: Unable to create Data for readTimestamp.");
|
||||
} else {
|
||||
info.readTimestamp = OBJECT_TO_JSVAL(dateObj);
|
||||
}
|
||||
}
|
||||
|
||||
mDeliveryInfo.AppendElement(info);
|
||||
}
|
||||
}
|
||||
@ -410,29 +376,6 @@ MmsMessage::GetData(ContentParent* aParent,
|
||||
convertTimeToInt(cx, info.deliveryTimestamp, infoData.deliveryTimestamp());
|
||||
}
|
||||
|
||||
// Prepare |infoData.readStatus|.
|
||||
ReadStatus readStatus;
|
||||
if (info.readStatus.Equals(READ_STATUS_NOT_APPLICABLE)) {
|
||||
readStatus = eReadStatus_NotApplicable;
|
||||
} else if (info.readStatus.Equals(READ_STATUS_SUCCESS)) {
|
||||
readStatus = eReadStatus_Success;
|
||||
} else if (info.readStatus.Equals(READ_STATUS_PENDING)) {
|
||||
readStatus = eReadStatus_Pending;
|
||||
} else if (info.readStatus.Equals(READ_STATUS_ERROR)) {
|
||||
readStatus = eReadStatus_Error;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
infoData.readStatus() = readStatus;
|
||||
|
||||
// Prepare |infoData.readTimestamp|.
|
||||
if (info.readTimestamp == JSVAL_NULL) {
|
||||
infoData.readTimestamp() = 0;
|
||||
} else {
|
||||
AutoJSContext cx;
|
||||
convertTimeToInt(cx, info.readTimestamp, infoData.readTimestamp());
|
||||
}
|
||||
|
||||
aData.deliveryInfo().AppendElement(infoData);
|
||||
}
|
||||
|
||||
@ -578,24 +521,6 @@ MmsMessage::GetDeliveryInfo(JSContext* aCx, JS::Value* aDeliveryInfo)
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Get |info.readStatus|.
|
||||
tmpJsStr = JS_NewUCStringCopyN(aCx,
|
||||
info.readStatus.get(),
|
||||
info.readStatus.Length());
|
||||
NS_ENSURE_TRUE(tmpJsStr, NS_ERROR_OUT_OF_MEMORY);
|
||||
|
||||
tmpJsVal.setString(tmpJsStr);
|
||||
if (!JS_DefineProperty(aCx, infoJsObj, "readStatus", tmpJsVal,
|
||||
NULL, NULL, JSPROP_ENUMERATE)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Get |info.readTimestamp|.
|
||||
if (!JS_DefineProperty(aCx, infoJsObj, "readTimestamp", info.readTimestamp,
|
||||
NULL, NULL, JSPROP_ENUMERATE)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
tmpJsVal = OBJECT_TO_JSVAL(infoJsObj);
|
||||
if (!JS_SetElement(aCx, deliveryInfo, i, &tmpJsVal)) {
|
||||
return NS_ERROR_FAILURE;
|
||||
|
@ -38,8 +38,6 @@
|
||||
#define FAILED_EVENT_NAME NS_LITERAL_STRING("failed")
|
||||
#define DELIVERY_SUCCESS_EVENT_NAME NS_LITERAL_STRING("deliverysuccess")
|
||||
#define DELIVERY_ERROR_EVENT_NAME NS_LITERAL_STRING("deliveryerror")
|
||||
#define READ_SUCCESS_EVENT_NAME NS_LITERAL_STRING("readsuccess")
|
||||
#define READ_ERROR_EVENT_NAME NS_LITERAL_STRING("readerror")
|
||||
|
||||
using namespace mozilla::dom::mobilemessage;
|
||||
|
||||
@ -64,8 +62,6 @@ NS_IMPL_EVENT_HANDLER(MobileMessageManager, sent)
|
||||
NS_IMPL_EVENT_HANDLER(MobileMessageManager, failed)
|
||||
NS_IMPL_EVENT_HANDLER(MobileMessageManager, deliverysuccess)
|
||||
NS_IMPL_EVENT_HANDLER(MobileMessageManager, deliveryerror)
|
||||
NS_IMPL_EVENT_HANDLER(MobileMessageManager, readsuccess)
|
||||
NS_IMPL_EVENT_HANDLER(MobileMessageManager, readerror)
|
||||
|
||||
void
|
||||
MobileMessageManager::Init(nsPIDOMWindow *aWindow)
|
||||
@ -85,8 +81,6 @@ MobileMessageManager::Init(nsPIDOMWindow *aWindow)
|
||||
obs->AddObserver(this, kSmsFailedObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsDeliverySuccessObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsDeliveryErrorObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsReadSuccessObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsReadErrorObserverTopic, false);
|
||||
}
|
||||
|
||||
void
|
||||
@ -105,8 +99,6 @@ MobileMessageManager::Shutdown()
|
||||
obs->RemoveObserver(this, kSmsFailedObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsDeliverySuccessObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsDeliveryErrorObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsReadSuccessObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsReadErrorObserverTopic);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@ -544,14 +536,6 @@ MobileMessageManager::Observe(nsISupports* aSubject, const char* aTopic,
|
||||
return DispatchTrustedSmsEventToSelf(aTopic, DELIVERY_ERROR_EVENT_NAME, aSubject);
|
||||
}
|
||||
|
||||
if (!strcmp(aTopic, kSmsReadSuccessObserverTopic)) {
|
||||
return DispatchTrustedSmsEventToSelf(aTopic, READ_SUCCESS_EVENT_NAME, aSubject);
|
||||
}
|
||||
|
||||
if (!strcmp(aTopic, kSmsReadErrorObserverTopic)) {
|
||||
return DispatchTrustedSmsEventToSelf(aTopic, READ_ERROR_EVENT_NAME, aSubject);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -38,16 +38,6 @@ enum DeliveryStatus {
|
||||
eDeliveryStatus_EndGuard
|
||||
};
|
||||
|
||||
// For MmsMessageData.readStatus.
|
||||
enum ReadStatus {
|
||||
eReadStatus_NotApplicable = 0,
|
||||
eReadStatus_Success,
|
||||
eReadStatus_Pending,
|
||||
eReadStatus_Error,
|
||||
// This state should stay at the end.
|
||||
eReadStatus_EndGuard
|
||||
};
|
||||
|
||||
// For {Mms,Sms}FilterData.read.
|
||||
enum ReadState {
|
||||
eReadState_Unknown = -1,
|
||||
@ -102,16 +92,6 @@ struct ParamTraits<mozilla::dom::mobilemessage::DeliveryStatus>
|
||||
mozilla::dom::mobilemessage::eDeliveryStatus_EndGuard>
|
||||
{};
|
||||
|
||||
/**
|
||||
* Read status serializer.
|
||||
*/
|
||||
template <>
|
||||
struct ParamTraits<mozilla::dom::mobilemessage::ReadStatus>
|
||||
: public EnumSerializer<mozilla::dom::mobilemessage::ReadStatus,
|
||||
mozilla::dom::mobilemessage::eReadStatus_NotApplicable,
|
||||
mozilla::dom::mobilemessage::eReadStatus_EndGuard>
|
||||
{};
|
||||
|
||||
/**
|
||||
* Read state serializer.
|
||||
*/
|
||||
|
@ -118,10 +118,6 @@ child:
|
||||
|
||||
NotifyReceivedSilentMessage(MobileMessageData aMessageData);
|
||||
|
||||
NotifyReadSuccessMessage(MobileMessageData aMessageData);
|
||||
|
||||
NotifyReadErrorMessage(MobileMessageData aMessageData);
|
||||
|
||||
parent:
|
||||
/**
|
||||
* Sent when the child no longer needs to use sms.
|
||||
|
@ -118,20 +118,6 @@ SmsChild::RecvNotifyReceivedSilentMessage(const MobileMessageData& aData)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SmsChild::RecvNotifyReadSuccessMessage(const MobileMessageData& aData)
|
||||
{
|
||||
NotifyObserversWithMobileMessage(kSmsReadSuccessObserverTopic, aData);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SmsChild::RecvNotifyReadErrorMessage(const MobileMessageData& aData)
|
||||
{
|
||||
NotifyObserversWithMobileMessage(kSmsReadErrorObserverTopic, aData);
|
||||
return true;
|
||||
}
|
||||
|
||||
PSmsRequestChild*
|
||||
SmsChild::AllocPSmsRequestChild(const IPCSmsRequest& aRequest)
|
||||
{
|
||||
|
@ -58,12 +58,6 @@ protected:
|
||||
virtual bool
|
||||
RecvNotifyReceivedSilentMessage(const MobileMessageData& aMessage) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool
|
||||
RecvNotifyReadSuccessMessage(const MobileMessageData& aMessage) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool
|
||||
RecvNotifyReadErrorMessage(const MobileMessageData& aMessage) MOZ_OVERRIDE;
|
||||
|
||||
virtual PSmsRequestChild*
|
||||
AllocPSmsRequestChild(const IPCSmsRequest& aRequest) MOZ_OVERRIDE;
|
||||
|
||||
|
@ -153,8 +153,6 @@ SmsParent::SmsParent()
|
||||
obs->AddObserver(this, kSmsDeliverySuccessObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsDeliveryErrorObserverTopic, false);
|
||||
obs->AddObserver(this, kSilentSmsReceivedObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsReadSuccessObserverTopic, false);
|
||||
obs->AddObserver(this, kSmsReadErrorObserverTopic, false);
|
||||
}
|
||||
|
||||
void
|
||||
@ -173,8 +171,6 @@ SmsParent::ActorDestroy(ActorDestroyReason why)
|
||||
obs->RemoveObserver(this, kSmsDeliverySuccessObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsDeliveryErrorObserverTopic);
|
||||
obs->RemoveObserver(this, kSilentSmsReceivedObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsReadSuccessObserverTopic);
|
||||
obs->RemoveObserver(this, kSmsReadErrorObserverTopic);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
@ -276,30 +272,6 @@ SmsParent::Observe(nsISupports* aSubject, const char* aTopic,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
if (!strcmp(aTopic, kSmsReadSuccessObserverTopic)) {
|
||||
MobileMessageData msgData;
|
||||
if (!GetMobileMessageDataFromMessage(aSubject, msgData)) {
|
||||
NS_ERROR("Got a 'sms-read-success' topic without a valid message!");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
unused << SendNotifyReadSuccessMessage(msgData);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!strcmp(aTopic, kSmsReadErrorObserverTopic)) {
|
||||
MobileMessageData msgData;
|
||||
if (!GetMobileMessageDataFromMessage(aSubject, msgData)) {
|
||||
NS_ERROR("Got a 'sms-read-error' topic without a valid message!");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
unused << SendNotifyReadErrorMessage(msgData);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,6 @@ include protocol PBlob;
|
||||
using DeliveryState from "mozilla/dom/mobilemessage/Types.h";
|
||||
using DeliveryStatus from "mozilla/dom/mobilemessage/Types.h";
|
||||
using MessageClass from "mozilla/dom/mobilemessage/Types.h";
|
||||
using ReadStatus from "mozilla/dom/mobilemessage/Types.h";
|
||||
using ReadState from "mozilla/dom/mobilemessage/Types.h";
|
||||
using MessageType from "mozilla/dom/mobilemessage/Types.h";
|
||||
|
||||
@ -52,8 +51,6 @@ struct MmsDeliveryInfoData
|
||||
nsString receiver;
|
||||
DeliveryStatus deliveryStatus;
|
||||
uint64_t deliveryTimestamp;
|
||||
ReadStatus readStatus;
|
||||
uint64_t readTimestamp;
|
||||
};
|
||||
|
||||
struct MmsMessageData
|
||||
|
Loading…
Reference in New Issue
Block a user