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

Backed out changeset c45f715f529c (bug 1067229) for ICS M8 Testfailures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-09-18 11:03:49 +02:00
parent 6bb1e18875
commit db2e3ca132
5 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/ipc/ContentChild.cpp
View File

@ -1830,15 +1830,12 @@ PreloadSlowThings()
bool
ContentChild::RecvAppInfo(const nsCString& version, const nsCString& buildID,
const nsCString& name, const nsCString& UAName,
const nsCString& ID, const nsCString& vendor)
const nsCString& name, const nsCString& UAName)
{
mAppInfo.version.Assign(version);
mAppInfo.buildID.Assign(buildID);
mAppInfo.name.Assign(name);
mAppInfo.UAName.Assign(UAName);
mAppInfo.ID.Assign(ID);
mAppInfo.vendor.Assign(vendor);
if (!Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
return true;

5
dom/ipc/ContentChild.h
View File

@ -70,8 +70,6 @@ public:
nsCString buildID;
nsCString name;
nsCString UAName;
nsCString ID;
nsCString vendor;
};
bool Init(MessageLoop* aIOLoop,
@ -299,8 +297,7 @@ public:
virtual bool RecvCycleCollect() MOZ_OVERRIDE;
virtual bool RecvAppInfo(const nsCString& version, const nsCString& buildID,
const nsCString& name, const nsCString& UAName,
const nsCString& ID, const nsCString& vendor) MOZ_OVERRIDE;
const nsCString& name, const nsCString& UAName) MOZ_OVERRIDE;
virtual bool RecvLastPrivateDocShellDestroyed() MOZ_OVERRIDE;

4
dom/ipc/ContentParent.cpp
View File

@ -2046,11 +2046,9 @@ ContentParent::InitInternal(ProcessPriority aInitialPriority,
nsCString buildID(gAppData->buildID);
nsCString name(gAppData->name);
nsCString UAName(gAppData->UAName);
nsCString ID(gAppData->ID);
nsCString vendor(gAppData->vendor);
// Sending all information to content process.
unused << SendAppInfo(version, buildID, name, UAName, ID, vendor);
unused << SendAppInfo(version, buildID, name, UAName);
}
nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance();

3
dom/ipc/PContent.ipdl
View File

@ -432,8 +432,7 @@ child:
*/
ActivateA11y();
AppInfo(nsCString version, nsCString buildID, nsCString name, nsCString UAName,
nsCString ID, nsCString vendor);
AppInfo(nsCString version, nsCString buildID, nsCString name, nsCString UAName);
// Notify child that last-pb-context-exited notification was observed
LastPrivateDocShellDestroyed();

8
toolkit/xre/nsAppRunner.cpp
View File

@ -644,9 +644,7 @@ NS_IMETHODIMP
nsXULAppInfo::GetVendor(nsACString& aResult)
{
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cc = ContentChild::GetSingleton();
aResult = cc->GetAppInfo().vendor;
return NS_OK;
return NS_ERROR_NOT_AVAILABLE;
}
aResult.Assign(gAppData->vendor);
@ -670,9 +668,7 @@ NS_IMETHODIMP
nsXULAppInfo::GetID(nsACString& aResult)
{
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cc = ContentChild::GetSingleton();
aResult = cc->GetAppInfo().ID;
return NS_OK;
return NS_ERROR_NOT_AVAILABLE;
}
aResult.Assign(gAppData->ID);