mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
1367963d3d
- Bug 1198124 - Enable -Wshadow in directories that have no -Wshadow warnings. r=glandium (d03cfc1bb6) - Bug 1204403 - Fix -Wshadow warnings in xpcom. r=mccr8 (3247b5b146) - Bug 1140120 - Remove a couple of unused test functions on ServiceWorkerContainer; r=baku (efe1119749) - Bug 1180148 - Clear service workers registered for a site when clearing the cookies and stored data is not working in b2g. r=baku (7fb1d522ff) - Bug 1162333 - Add stronger assertions to PromiseWorkerProxy in debug builds. r=catalinb (0005a76252) - Bug 1190672 - Fix use of AutoReleasePromiseWorkerProxy in PushManager. r=catalinb (18f7358163) - Bug 1191495 - Relax PushManager callback assertions. r=kitcambridge (8a3822969f) - Bug 1189543 - pushManager.getSubscription() should return null for nonexistent push subscriptions in workers. r=nsm (b990083262) - spacing (44b87017a7) - Bug 1180295 - Rip out the Fennec code to set the screen render offset. r=rbarker (67183ae8bf) - Bug 1187804 - Un-adjust fixed layers by the async transform of the scroll frame that they're fixed with respect to, not of the nearest ancestor scroll frame. r=kats (7c5e7ac29c) - Bug 1131359 - Fix an include-what-you-use error in AsyncCompositionManager.cpp. r=kats (fe04815939) - Bug 1187804 - When a layer is scrolled by multiple scroll frames, do an AlignFixedAndStickyLayers pass on its subtree for each of the scroll frames. r=kats (031a5686f1) - Bug 1180295 - Stop clipping the content while the toolbar is in the process of sliding off. r=rbarker (9d806870e4) - Bug 1186968 - Fix Compositor::SetScreenRotation() call r=nical (e554c4b4a2) - Bug 1180295 - Implement seamless snapping to the stable state. r=rbarker (d1e7978eb7) - Bug 1131470 - Part 1: Rename existing use of ScreenOrientation to ScreenOrientationInternal. r=baku (63f0cb994b) - Bug 1131470 - Part 2: Update screen configuration HAL to report orientation angle. r=snorp,mwu (39b537f008) - Bug 1167597 - Mark PromiseReportRejectFeature::mPromise as MOZ_NON_OWNING_REF. r=ehsan (3ad520790a) - Bug 1086627 - Rename Promise constructs to more closely match the specification. r=nsm,jst (cea1d71cb1) - Bug 1086627 - Rename ThenableResolverTask to PromiseResolveThenableJob to more closely match Promise spec. r=nsm (e7102fe506) - Bug 1164725 - Convert flags in nsIDocument into bit fields. r=smaug (9f5d5f352d) - Bug 1192467 - Formalize precondition that SetDisplayDocument must not be called with null. - r=peterv (1aa8e91d14) - Bug 1153841 - Remove the 'it must be 2D' restriction for transforms on fixed-pos layers. r=BenWa,mattwoodrow (5bab86ec6a) - Bug 1173521 - Properly handle unapplying 3D projective transforms to rectangles in APZ code. r=botond (45c9850d5c) - Bug 1166301 - When applying an async adjustment to a fixed layer, only adjust its mask layer under the same circumstances as its clip rect. r=mattwoodrow (2801c48fe9) - Bug 1166301 - Update an old comment in AsyncCompositionManager::AlignFixedAndStickyLayers. r=kats (7e1d5c97d0) - Bug 1166301 - Allow async scrolling to move the clip rects of fixed background layers. r=mattwoodrow (edd889ec2b) - Bug 1200399 - Only send the RCD's metrics to Java-land for fennec-apz. r=rbarker (3b36a52f3a) - Bug 1201625 - Special-case B2GDroid since it doesn't have a root content document. r=rbarker (4fcdda1b0a) - Bug 1201529 - Fall back to rootmost metrics if there is no root content document metrics. r=botond (615c2ee727) - Bug 1201581 - Extract a helper method. r=rbarker (f2cccb8666) - Bug 1201581 - Hook up the syncFrameMetrics call to sync metrics info from the compositor to Java-land on each composite. r=rbarker (48e15bbde8) - Bug 1203760 P1 Allow pipe to wake up multiple streams at the same time. r=froydnj (5baed00637) - Bug 1203760 P2 Add gtests for nsPipeInputStream AsyncRead(). r=froydnj (52e5129dc8) - Bug 1201889 - When adjusting fixed and sticky layers in AsyncCompsitionManager, unapply all async transforms on the path from the fixed layer to the layer it's fixed with respect to. r=kats (dbb203178e) - Bug 1165536. Don't include resolution compensation when adjusting the cliprect of ancestors of scrollbars. r=botond (3bef5f2c18) - Fix async transforms on scrollbars not including any existing shadow transform. (bug 1128740 part 2, r=botond) (af12d76775) - missing of Bug 943728 - Replace double quotes with single quotes in Makefiles (e11470540f) - Bug 1188766 - Avoid exporting UPLOAD_EXTRA_FILES from mozconfig. r=mshal (4241b9e80b) - Fixup for bug 1188766 for valgrind bustage on a CLOSED TREE. r=me (4401dedf06) - Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium (6eca1e5214) - Bug 1200523 - Remove leftover debugging code from js/src/Makefile.in; r=ted (414b72c74e) - spacing (99cda3f8a7)
319 lines
8.4 KiB
C++
319 lines
8.4 KiB
C++
/* 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/. */
|
|
|
|
#include "nsIDirectoryService.h"
|
|
#include "DirectoryProvider.h"
|
|
|
|
#include "nsIFile.h"
|
|
#include "nsISimpleEnumerator.h"
|
|
#include "nsIPrefService.h"
|
|
#include "nsIPrefBranch.h"
|
|
|
|
#include "nsArrayEnumerator.h"
|
|
#include "nsEnumeratorUtils.h"
|
|
#include "nsAppDirectoryServiceDefs.h"
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#include "nsCategoryManagerUtils.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsCOMArray.h"
|
|
#include "nsDirectoryServiceUtils.h"
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsStringAPI.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "nsIPrefLocalizedString.h"
|
|
|
|
namespace mozilla {
|
|
namespace browser {
|
|
|
|
NS_IMPL_ISUPPORTS(DirectoryProvider,
|
|
nsIDirectoryServiceProvider,
|
|
nsIDirectoryServiceProvider2)
|
|
|
|
NS_IMETHODIMP
|
|
DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult)
|
|
{
|
|
nsresult rv;
|
|
|
|
*aResult = nullptr;
|
|
|
|
// NOTE: This function can be reentrant through the NS_GetSpecialDirectory
|
|
// call, so be careful not to cause infinite recursion.
|
|
|
|
nsCOMPtr<nsIFile> file;
|
|
|
|
char const* leafName = nullptr;
|
|
|
|
if (!strcmp(aKey, NS_APP_BOOKMARKS_50_FILE)) {
|
|
leafName = "bookmarks.html";
|
|
|
|
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
|
|
if (prefs) {
|
|
nsCString path;
|
|
rv = prefs->GetCharPref("browser.bookmarks.file", getter_Copies(path));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
NS_NewNativeLocalFile(path, true, getter_AddRefs(file));
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsDependentCString leafstr(leafName);
|
|
|
|
nsCOMPtr<nsIFile> parentDir;
|
|
if (file) {
|
|
rv = file->GetParent(getter_AddRefs(parentDir));
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
}
|
|
else {
|
|
rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(parentDir));
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
rv = parentDir->Clone(getter_AddRefs(file));
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
file->AppendNative(leafstr);
|
|
}
|
|
|
|
*aPersist = true;
|
|
NS_ADDREF(*aResult = file);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
static void
|
|
AppendFileKey(const char *key, nsIProperties* aDirSvc,
|
|
nsCOMArray<nsIFile> &array)
|
|
{
|
|
nsCOMPtr<nsIFile> file;
|
|
nsresult rv = aDirSvc->Get(key, NS_GET_IID(nsIFile), getter_AddRefs(file));
|
|
if (NS_FAILED(rv))
|
|
return;
|
|
|
|
bool exists;
|
|
rv = file->Exists(&exists);
|
|
if (NS_FAILED(rv) || !exists)
|
|
return;
|
|
|
|
array.AppendObject(file);
|
|
}
|
|
|
|
// Appends the distribution-specific search engine directories to the
|
|
// array. The directory structure is as follows:
|
|
|
|
// appdir/
|
|
// \- distribution/
|
|
// \- searchplugins/
|
|
// |- common/
|
|
// \- locale/
|
|
// |- <locale 1>/
|
|
// ...
|
|
// \- <locale N>/
|
|
|
|
// common engines are loaded for all locales. If there is no locale
|
|
// directory for the current locale, there is a pref:
|
|
// "distribution.searchplugins.defaultLocale"
|
|
// which specifies a default locale to use.
|
|
|
|
static void
|
|
AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array)
|
|
{
|
|
nsCOMPtr<nsIFile> searchPlugins;
|
|
nsresult rv = aDirSvc->Get(XRE_APP_DISTRIBUTION_DIR,
|
|
NS_GET_IID(nsIFile),
|
|
getter_AddRefs(searchPlugins));
|
|
if (NS_FAILED(rv))
|
|
return;
|
|
searchPlugins->AppendNative(NS_LITERAL_CSTRING("searchplugins"));
|
|
|
|
bool exists;
|
|
rv = searchPlugins->Exists(&exists);
|
|
if (NS_FAILED(rv) || !exists)
|
|
return;
|
|
|
|
nsCOMPtr<nsIFile> commonPlugins;
|
|
rv = searchPlugins->Clone(getter_AddRefs(commonPlugins));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
commonPlugins->AppendNative(NS_LITERAL_CSTRING("common"));
|
|
rv = commonPlugins->Exists(&exists);
|
|
if (NS_SUCCEEDED(rv) && exists)
|
|
array.AppendObject(commonPlugins);
|
|
}
|
|
|
|
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
|
|
if (prefs) {
|
|
|
|
nsCOMPtr<nsIFile> localePlugins;
|
|
rv = searchPlugins->Clone(getter_AddRefs(localePlugins));
|
|
if (NS_FAILED(rv))
|
|
return;
|
|
|
|
localePlugins->AppendNative(NS_LITERAL_CSTRING("locale"));
|
|
|
|
nsCString locale;
|
|
nsCOMPtr<nsIPrefLocalizedString> prefString;
|
|
rv = prefs->GetComplexValue("general.useragent.locale",
|
|
NS_GET_IID(nsIPrefLocalizedString),
|
|
getter_AddRefs(prefString));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
nsAutoString wLocale;
|
|
prefString->GetData(getter_Copies(wLocale));
|
|
CopyUTF16toUTF8(wLocale, locale);
|
|
} else {
|
|
rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale));
|
|
}
|
|
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
nsCOMPtr<nsIFile> curLocalePlugins;
|
|
rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
curLocalePlugins->AppendNative(locale);
|
|
rv = curLocalePlugins->Exists(&exists);
|
|
if (NS_SUCCEEDED(rv) && exists) {
|
|
array.AppendObject(curLocalePlugins);
|
|
return; // all done
|
|
}
|
|
}
|
|
}
|
|
|
|
// we didn't append the locale dir - try the default one
|
|
nsCString defLocale;
|
|
rv = prefs->GetCharPref("distribution.searchplugins.defaultLocale",
|
|
getter_Copies(defLocale));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
nsCOMPtr<nsIFile> defLocalePlugins;
|
|
rv = localePlugins->Clone(getter_AddRefs(defLocalePlugins));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
defLocalePlugins->AppendNative(defLocale);
|
|
rv = defLocalePlugins->Exists(&exists);
|
|
if (NS_SUCCEEDED(rv) && exists)
|
|
array.AppendObject(defLocalePlugins);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DirectoryProvider::GetFiles(const char *aKey, nsISimpleEnumerator* *aResult)
|
|
{
|
|
nsresult rv;
|
|
|
|
if (!strcmp(aKey, NS_APP_SEARCH_DIR_LIST)) {
|
|
nsCOMPtr<nsIProperties> dirSvc
|
|
(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID));
|
|
if (!dirSvc)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
nsCOMArray<nsIFile> baseFiles;
|
|
|
|
/**
|
|
* We want to preserve the following order, since the search service loads
|
|
* engines in first-loaded-wins order.
|
|
* - extension search plugin locations (prepended below using
|
|
* NS_NewUnionEnumerator)
|
|
* - distro search plugin locations
|
|
* - user search plugin locations (profile)
|
|
* - app search plugin location (shipped engines)
|
|
*/
|
|
AppendDistroSearchDirs(dirSvc, baseFiles);
|
|
AppendFileKey(NS_APP_USER_SEARCH_DIR, dirSvc, baseFiles);
|
|
AppendFileKey(NS_APP_SEARCH_DIR, dirSvc, baseFiles);
|
|
|
|
nsCOMPtr<nsISimpleEnumerator> baseEnum;
|
|
rv = NS_NewArrayEnumerator(getter_AddRefs(baseEnum), baseFiles);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
nsCOMPtr<nsISimpleEnumerator> list;
|
|
rv = dirSvc->Get(XRE_EXTENSIONS_DIR_LIST,
|
|
NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(list));
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
static char const *const kAppendSPlugins[] = {"searchplugins", nullptr};
|
|
|
|
nsCOMPtr<nsISimpleEnumerator> extEnum =
|
|
new AppendingEnumerator(list, kAppendSPlugins);
|
|
if (!extEnum)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
return NS_NewUnionEnumerator(aResult, extEnum, baseEnum);
|
|
}
|
|
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
|
|
|
|
NS_IMETHODIMP
|
|
DirectoryProvider::AppendingEnumerator::HasMoreElements(bool *aResult)
|
|
{
|
|
*aResult = mNext ? true : false;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DirectoryProvider::AppendingEnumerator::GetNext(nsISupports* *aResult)
|
|
{
|
|
if (aResult)
|
|
NS_ADDREF(*aResult = mNext);
|
|
|
|
mNext = nullptr;
|
|
|
|
nsresult rv;
|
|
|
|
// Ignore all errors
|
|
|
|
bool more;
|
|
while (NS_SUCCEEDED(mBase->HasMoreElements(&more)) && more) {
|
|
nsCOMPtr<nsISupports> nextbasesupp;
|
|
mBase->GetNext(getter_AddRefs(nextbasesupp));
|
|
|
|
nsCOMPtr<nsIFile> nextbase(do_QueryInterface(nextbasesupp));
|
|
if (!nextbase)
|
|
continue;
|
|
|
|
nextbase->Clone(getter_AddRefs(mNext));
|
|
if (!mNext)
|
|
continue;
|
|
|
|
char const *const * i = mAppendList;
|
|
while (*i) {
|
|
mNext->AppendNative(nsDependentCString(*i));
|
|
++i;
|
|
}
|
|
|
|
bool exists;
|
|
rv = mNext->Exists(&exists);
|
|
if (NS_SUCCEEDED(rv) && exists)
|
|
break;
|
|
|
|
mNext = nullptr;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
DirectoryProvider::AppendingEnumerator::AppendingEnumerator
|
|
(nsISimpleEnumerator* aBase,
|
|
char const *const *aAppendList) :
|
|
mBase(aBase),
|
|
mAppendList(aAppendList)
|
|
{
|
|
// Initialize mNext to begin.
|
|
GetNext(nullptr);
|
|
}
|
|
|
|
} // namespace browser
|
|
} // namespace mozilla
|