mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from rmottola/Arctic-Fox:
- Goanna->Gecko: GoannaMediaPluginService & GoannaTouchDispatcher (1e10799bf) - Goanna->Gecko: GoannaProcess (dd671240a) - Goanna->Gecko: goannamediaplugin (2a9423ba6) - Goanna->Gecko: GoannaContentController (62e7c2f5f) - Goanna->Gecko: GoannaProfiler & GoannaTaskTracer (376c45a3c)
This commit is contained in:
@@ -1034,7 +1034,7 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc,
|
||||
new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback);
|
||||
|
||||
#ifdef MOZ_B2G
|
||||
if (XRE_GetProcessType() == GoannaProcessType_Content) {
|
||||
if (XRE_GetProcessType() == GeckoProcessType_Content) {
|
||||
prefCallback->HandleCompletion(nsIContentPrefCallback2::COMPLETE_ERROR);
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -1065,7 +1065,7 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir)
|
||||
}
|
||||
|
||||
#ifdef MOZ_B2G
|
||||
if (XRE_GetProcessType() == GoannaProcessType_Content) {
|
||||
if (XRE_GetProcessType() == GeckoProcessType_Content) {
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user