Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 4a713bd

Browse files
MortimerGorobluemarvin
authored andcommitted
Bump GV to 74.0.20200107095722 (#2597)
1 parent 8a91dcb commit 4a713bd

File tree

2 files changed

+39
-3
lines changed

2 files changed

+39
-3
lines changed

app/src/main/cpp/moz_external_vr.h

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ namespace gfx {
4747
// and mapped files if we have both release and nightlies
4848
// running at the same time? Or...what if we have multiple
4949
// release builds running on same machine? (Bug 1563232)
50-
#define SHMEM_VERSION "0.0.6"
51-
static const int32_t kVRExternalVersion = 13;
50+
#define SHMEM_VERSION "0.0.7"
51+
static const int32_t kVRExternalVersion = 14;
5252

5353
// We assign VR presentations to groups with a bitmask.
5454
// Currently, we will only display either content or chrome.
@@ -543,6 +543,41 @@ struct VRWindowState {
543543
char signalName[32];
544544
};
545545

546+
enum class VRTelemetryId : uint8_t {
547+
NONE = 0,
548+
INSTALLED_FROM = 1,
549+
ENTRY_METHOD = 2,
550+
FIRST_RUN = 3,
551+
TOTAL = 4,
552+
};
553+
554+
enum class VRTelemetryInstallFrom: uint8_t {
555+
User = 0,
556+
FxR = 1,
557+
HTC = 2,
558+
Valve = 3,
559+
TOTAL = 4,
560+
};
561+
562+
enum class VRTelemetryEntryMethod: uint8_t {
563+
SystemBtn = 0,
564+
Library = 1,
565+
Gaze = 2,
566+
TOTAL = 3,
567+
};
568+
569+
struct VRTelemetryState {
570+
uint32_t uid;
571+
572+
bool installedFrom : 1;
573+
bool entryMethod : 1;
574+
bool firstRun : 1;
575+
576+
uint8_t installedFromValue : 3;
577+
uint8_t entryMethodValue : 3;
578+
bool firstRunValue : 1;
579+
};
580+
546581
struct VRExternalShmem {
547582
int32_t version;
548583
int32_t size;
@@ -570,6 +605,7 @@ struct VRExternalShmem {
570605
#endif // !defined(__ANDROID__)
571606
#if defined(XP_WIN)
572607
VRWindowState windowState;
608+
VRTelemetryState telemetryState;
573609
#endif
574610
#ifdef MOZILLA_INTERNAL_API
575611
void Clear() volatile {

versions.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ext.deps = [:]
2424
def versions = [:]
2525
// GeckoView versions can be found here:
2626
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
27-
versions.gecko_view = "73.0.20191220095035"
27+
versions.gecko_view = "74.0.20200107095722"
2828
versions.android_components = "21.0.0"
2929
// Note that android-components also depends on application-services,
3030
// and in fact is our main source of appservices-related functionality.

0 commit comments

Comments
 (0)