nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1897317 - Rename MOZ_ANDROID_HISTORY to MOZ_GECKOVIEW_HISTORY. r=firefox-build-system-reviewers,geckoview-reviewers,nalexander,owlish

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D210743
This commit is contained in:
Mike Hommey 2024-05-17 00:29:35 +00:00
parent b2b99f4e80
commit 0166b77500
10 changed files with 20 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
dom/ipc/BrowserParent.cpp
View file

@ -147,7 +147,7 @@
# include "mozilla/a11y/nsWinUtils.h" # include "mozilla/a11y/nsWinUtils.h"
#endif #endif
#ifdef MOZ_ANDROID_HISTORY #ifdef MOZ_GECKOVIEW_HISTORY
# include "GeckoViewHistory.h" # include "GeckoViewHistory.h"
#endif #endif
@ -3947,7 +3947,7 @@ mozilla::ipc::IPCResult BrowserParent::RecvVisitURI(
mozilla::ipc::IPCResult BrowserParent::RecvQueryVisitedState( mozilla::ipc::IPCResult BrowserParent::RecvQueryVisitedState(
nsTArray<RefPtr<nsIURI>>&& aURIs) { nsTArray<RefPtr<nsIURI>>&& aURIs) {
#ifdef MOZ_ANDROID_HISTORY #ifdef MOZ_GECKOVIEW_HISTORY
nsCOMPtr<IHistory> history = components::History::Service(); nsCOMPtr<IHistory> history = components::History::Service();
if (NS_WARN_IF(!history)) { if (NS_WARN_IF(!history)) {
return IPC_OK(); return IPC_OK();

2
dom/push/PushRecord.sys.mjs
View file

@ -128,7 +128,7 @@ PushRecord.prototype = {
return Date.now(); return Date.now();
} }
if (AppConstants.MOZ_ANDROID_HISTORY) { if (AppConstants.MOZ_GECKOVIEW_HISTORY) {
let result = await lazy.EventDispatcher.instance.sendRequestForResult({ let result = await lazy.EventDispatcher.instance.sendRequestForResult({
type: "History:GetPrePathLastVisitedTimeMilliseconds", type: "History:GetPrePathLastVisitedTimeMilliseconds",
prePath: this.uri.prePath, prePath: this.uri.prePath,

2
mobile/android/moz.configure
View file

@ -59,7 +59,7 @@ set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
imply_option("MOZ_NORMANDY", False) imply_option("MOZ_NORMANDY", False)
imply_option("MOZ_SERVICES_HEALTHREPORT", True) imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_ANDROID_HISTORY", True) imply_option("MOZ_GECKOVIEW_HISTORY", True)
@depends(target) @depends(target)

2
mobile/shared/components/geckoview/components.conf
View file

@ -75,7 +75,7 @@ Classes = [
}, },
] ]
if defined('MOZ_ANDROID_HISTORY'): if defined('MOZ_GECKOVIEW_HISTORY'):
Classes += [ Classes += [
{ {
'name': 'History', 'name': 'History',

2
mobile/shared/components/geckoview/moz.build
View file

@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG["MOZ_ANDROID_HISTORY"]: if CONFIG["MOZ_GECKOVIEW_HISTORY"]:
EXPORTS += [ EXPORTS += [
"GeckoViewHistory.h", "GeckoViewHistory.h",
] ]

4
python/mozperftest/mozperftest/tests/data/browsertime-results-video/browsertime.json
View file

@ -49,7 +49,7 @@
"MOZILLA_OFFICIAL": false, "MOZILLA_OFFICIAL": false,
"MOZ_ALLOW_ADDON_SIDELOAD": false, "MOZ_ALLOW_ADDON_SIDELOAD": false,
"MOZ_ALLOW_LEGACY_EXTENSIONS": false, "MOZ_ALLOW_LEGACY_EXTENSIONS": false,
"MOZ_ANDROID_HISTORY": false, "MOZ_GECKOVIEW_HISTORY": false,
"MOZ_APP_BASENAME": "Firefox", "MOZ_APP_BASENAME": "Firefox",
"MOZ_APP_NAME": "firefox", "MOZ_APP_NAME": "firefox",
"MOZ_APP_VERSION": "81.0a1", "MOZ_APP_VERSION": "81.0a1",
@ -118,7 +118,7 @@
"MOZILLA_OFFICIAL": false, "MOZILLA_OFFICIAL": false,
"MOZ_ALLOW_ADDON_SIDELOAD": false, "MOZ_ALLOW_ADDON_SIDELOAD": false,
"MOZ_ALLOW_LEGACY_EXTENSIONS": false, "MOZ_ALLOW_LEGACY_EXTENSIONS": false,
"MOZ_ANDROID_HISTORY": false, "MOZ_GECKOVIEW_HISTORY": false,
"MOZ_APP_BASENAME": "Firefox", "MOZ_APP_BASENAME": "Firefox",
"MOZ_APP_NAME": "firefox", "MOZ_APP_NAME": "firefox",
"MOZ_APP_VERSION": "81.0a1", "MOZ_APP_VERSION": "81.0a1",

2
python/mozperftest/mozperftest/tests/data/browsertime-results/browsertime.json
View file

File diff suppressed because one or more lines are too long

4
toolkit/modules/AppConstants.sys.mjs
View file

@ -327,8 +327,8 @@ export var AppConstants = Object.freeze({
false, false,
#endif #endif
MOZ_ANDROID_HISTORY: MOZ_GECKOVIEW_HISTORY:
#ifdef MOZ_ANDROID_HISTORY #ifdef MOZ_GECKOVIEW_HISTORY
true, true,
#else #else
false, false,

16
toolkit/moz.configure
View file

@ -970,8 +970,8 @@ project_flag(
project_flag("MOZ_SERVICES_SYNC", help="Build Sync Services if required") project_flag("MOZ_SERVICES_SYNC", help="Build Sync Services if required")
project_flag( project_flag(
"MOZ_ANDROID_HISTORY", "MOZ_GECKOVIEW_HISTORY",
help="Enable Android History instead of Places", help="Enable Geckoview History instead of Places",
set_as_define=True, set_as_define=True,
) )
@ -1001,12 +1001,12 @@ project_flag(
) )
@depends("MOZ_PLACES", "MOZ_ANDROID_HISTORY") @depends("MOZ_PLACES", "MOZ_GECKOVIEW_HISTORY")
def check_places_and_android_history(places, android_history): def check_places_and_geckoview_history(places, geckoview_history):
if places and android_history: if places and geckoview_history:
die("Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.") die("Cannot use MOZ_GECKOVIEW_HISTORY alongside MOZ_PLACES.")
if not places and not android_history: if not places and not geckoview_history:
die("One of MOZ_ANDROID_HISTORY or MOZ_PLACES must be set.") die("One of MOZ_GECKOVIEW_HISTORY or MOZ_PLACES must be set.")
option( option(

2
widget/android/nsAppShell.cpp
View file

@ -53,7 +53,7 @@
#include <pthread.h> #include <pthread.h>
#include <wchar.h> #include <wchar.h>
#ifdef MOZ_ANDROID_HISTORY #ifdef MOZ_GECKOVIEW_HISTORY
# include "nsNetUtil.h" # include "nsNetUtil.h"
# include "nsIURI.h" # include "nsIURI.h"
# include "IHistory.h" # include "IHistory.h"