wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1058376: Ignore file update in Nuwa. r=dhylands

Browse Source
This commit is contained in:
Patrick Wang (Chih-Kai Wang) 2014-09-17 10:22:29 +08:00
parent 7259924ae0
commit 94c0486abc
2 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dom/ipc/ContentParent.cpp
View File

@ -339,30 +339,6 @@ namespace dom {
#ifdef MOZ_NUWA_PROCESS
bool ContentParent::sNuwaReady = false;
// Contains data that is observed by Nuwa and is going to be sent to
// the new process when it is forked.
struct ContentParent::NuwaReinitializeData {
NuwaReinitializeData()
: mReceivedFilePathUpdate(false)
, mReceivedFileSystemUpdate(false) { }
bool mReceivedFilePathUpdate;
nsString mFilePathUpdateStoageType;
nsString mFilePathUpdateStorageName;
nsString mFilePathUpdatePath;
nsCString mFilePathUpdateReason;
bool mReceivedFileSystemUpdate;
nsString mFileSystemUpdateFsName;
nsString mFileSystemUpdateMountPount;
int32_t mFileSystemUpdateState;
int32_t mFileSystemUpdateMountGeneration;
bool mFileSystemUpdateIsMediaPresent;
bool mFileSystemUpdateIsSharing;
bool mFileSystemUpdateIsFormatting;
bool mFileSystemUpdateIsFake;
};
#endif
#define NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC "ipc:network:set-offline"
@ -2508,26 +2484,6 @@ ContentParent::RecvAddNewProcess(const uint32_t& aPid,
RecvGetXPCOMProcessAttributes(&isOffline);
content->SendSetOffline(isOffline);
// Send observed updates to new content.
if (mReinitializeData) {
if (mReinitializeData->mReceivedFilePathUpdate) {
unused << content->SendFilePathUpdate(mReinitializeData->mFilePathUpdateStoageType,
mReinitializeData->mFilePathUpdateStorageName,
mReinitializeData->mFilePathUpdatePath,
mReinitializeData->mFilePathUpdateReason);
}
if (mReinitializeData->mReceivedFilePathUpdate) {
unused << content->SendFileSystemUpdate(mReinitializeData->mFileSystemUpdateFsName,
mReinitializeData->mFileSystemUpdateMountPount,
mReinitializeData->mFileSystemUpdateState,
mReinitializeData->mFileSystemUpdateMountGeneration,
mReinitializeData->mFileSystemUpdateIsMediaPresent,
mReinitializeData->mFileSystemUpdateIsSharing,
mReinitializeData->mFileSystemUpdateIsFormatting,
mReinitializeData->mFileSystemUpdateIsFake);
}
}
PreallocatedProcessManager::PublishSpareProcess(content);
return true;
#else
@ -2672,23 +2628,11 @@ ContentParent::Observe(nsISupports* aSubject,
DeviceStorageFile* file = static_cast<DeviceStorageFile*>(aSubject);
#ifdef MOZ_NUWA_PROCESS
if (!(IsNuwaReady() && IsNuwaProcess())) {
if (!(IsNuwaReady() && IsNuwaProcess()))
#endif
{
unused << SendFilePathUpdate(file->mStorageType, file->mStorageName, file->mPath, creason);
#ifdef MOZ_NUWA_PROCESS
} else {
if (!mReinitializeData) {
mReinitializeData = new NuwaReinitializeData();
}
mReinitializeData->mReceivedFilePathUpdate = true;
mReinitializeData->mFilePathUpdateStoageType = file->mStorageType;
mReinitializeData->mFilePathUpdateStorageName = file->mStorageName;
mReinitializeData->mFilePathUpdatePath = file->mPath;
mReinitializeData->mFilePathUpdateReason = creason;
}
#endif
}
#ifdef MOZ_WIDGET_GONK
else if(!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
@ -2716,29 +2660,13 @@ ContentParent::Observe(nsISupports* aSubject,
vol->GetIsFake(&isFake);
#ifdef MOZ_NUWA_PROCESS
if (!(IsNuwaReady() && IsNuwaProcess())) {
if (!(IsNuwaReady() && IsNuwaProcess()))
#endif
{
unused << SendFileSystemUpdate(volName, mountPoint, state,
mountGeneration, isMediaPresent,
isSharing, isFormatting, isFake);
#ifdef MOZ_NUWA_PROCESS
} else {
if (!mReinitializeData) {
mReinitializeData = new NuwaReinitializeData();
}
mReinitializeData->mReceivedFileSystemUpdate = true;
mReinitializeData->mFileSystemUpdateFsName = volName;
mReinitializeData->mFileSystemUpdateMountPount = mountPoint;
mReinitializeData->mFileSystemUpdateState = state;
mReinitializeData->mFileSystemUpdateMountPount = mountGeneration;
mReinitializeData->mFileSystemUpdateIsMediaPresent = isMediaPresent;
mReinitializeData->mFileSystemUpdateIsSharing = isSharing;
mReinitializeData->mFileSystemUpdateIsFormatting = isFormatting;
mReinitializeData->mFileSystemUpdateIsFake = isFake;
}
#endif
} else if (!strcmp(aTopic, "phone-state-changed")) {
nsString state(aData);
unused << SendNotifyPhoneStateChange(state);

2
dom/ipc/ContentParent.h
View File

@ -718,8 +718,6 @@ private:
#ifdef MOZ_NUWA_PROCESS
static bool sNuwaReady;
struct NuwaReinitializeData;
nsAutoPtr<NuwaReinitializeData> mReinitializeData;
#endif
};