From 65b37410ca38005bd6f4c9470c93a49cd12ad368 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 18:00:45 -0500 Subject: Revert "Issue #190 - Part 1: Remove XP_IOS conditional code" This reverts commit 6a3d5769d01ec1a8dd56ea79aec2df91b801ce02. --- toolkit/xre/UIKitDirProvider.h | 13 +++++++++++++ toolkit/xre/nsXREDirProvider.cpp | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 toolkit/xre/UIKitDirProvider.h (limited to 'toolkit') diff --git a/toolkit/xre/UIKitDirProvider.h b/toolkit/xre/UIKitDirProvider.h new file mode 100644 index 0000000000..c74596125c --- /dev/null +++ b/toolkit/xre/UIKitDirProvider.h @@ -0,0 +1,13 @@ +/* -*- 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 TOOLKIT_XRE_UIKITDIRPROVIDER_H_ +#define TOOLKIT_XRE_UIKITDIRPROVIDER_H_ + +#include "nsString.h" + +bool GetUIKitDirectory(bool aLocal, nsACString& aUserDir); + +#endif // TOOLKIT_XRE_UIKITDIRPROVIDER_H_ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 158fe541bd..151eb34e53 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -58,6 +58,9 @@ #ifdef XP_UNIX #include #endif +#ifdef XP_IOS +#include "UIKitDirProvider.h" +#endif #if defined(XP_MACOSX) #define APP_REGISTRY_NAME "Application Registry" @@ -1307,6 +1310,14 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) NS_ENSURE_SUCCESS(rv, rv); localDir = do_QueryInterface(dirFileMac, &rv); +#elif defined(XP_IOS) + nsAutoCString userDir; + if (GetUIKitDirectory(aLocal, userDir)) { + rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); + } else { + rv = NS_ERROR_FAILURE; + } + NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) nsString path; if (aLocal) { -- cgit v1.2.3