diff options
author | Matt A. Tobin <email@mattatobin.com> | 2022-04-09 16:54:27 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-09 16:54:27 -0500 |
commit | c20b0d75a7d9b5cc88d037f602184d6c313e7942 (patch) | |
tree | 29493ecd6a4dd21ff966c29f4fc20a396ef9d715 /system | |
parent | 5c005621a633a42d04fb7d540a1ee0587a806446 (diff) | |
download | aura-central-c20b0d75a7d9b5cc88d037f602184d6c313e7942.tar.gz |
Revert "Issue %3057 - Part 6: Revert some of the previous changes for new approach."
This reverts commit 2b321abe2ee48f8c33de8e7f90b59ba0e88e388d.
Diffstat (limited to 'system')
-rw-r--r-- | system/graphics/layers/composite/FPSCounter.cpp | 4 | ||||
-rw-r--r-- | system/runtime/nsAppRunner.cpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/system/graphics/layers/composite/FPSCounter.cpp b/system/graphics/layers/composite/FPSCounter.cpp index b8e93eb97..0cbc76066 100644 --- a/system/graphics/layers/composite/FPSCounter.cpp +++ b/system/graphics/layers/composite/FPSCounter.cpp @@ -364,7 +364,11 @@ FPSCounter::WriteFrameTimeStamps() PR_Close(fd); nsAutoCString path; +#ifdef XP_WIN + rv = resultFile->GetPersistentDescriptor(path); +#else rv = resultFile->GetNativePath(path); +#endif NS_ENSURE_SUCCESS(rv, rv); printf_stderr("Wrote FPS data to file: %s\n", path.get()); diff --git a/system/runtime/nsAppRunner.cpp b/system/runtime/nsAppRunner.cpp index 459de8e7d..c6569dc96 100644 --- a/system/runtime/nsAppRunner.cpp +++ b/system/runtime/nsAppRunner.cpp @@ -1982,8 +1982,13 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n profile->GetRootDir(getter_AddRefs(prefsJSFile)); prefsJSFile->AppendNative(NS_LITERAL_CSTRING("prefs.js")); nsAutoCString pathStr; +#ifdef XP_WIN + prefsJSFile->GetPersistentDescriptor(pathStr); +#else prefsJSFile->GetNativePath(pathStr); +#endif PR_fprintf(PR_STDERR, "Success: created profile '%s' at '%s'\n", arg, pathStr.get()); + bool exists; prefsJSFile->Exists(&exists); if (!exists) { |