Skip to content

Commit

Permalink
Bump GV to 74.0.20200107095722 (#2597)
Browse files Browse the repository at this point in the history
  • Loading branch information
MortimerGoro authored and bluemarvin committed Jan 7, 2020
1 parent 8a91dcb commit 4a713bd
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
40 changes: 38 additions & 2 deletions app/src/main/cpp/moz_external_vr.h
Expand Up @@ -47,8 +47,8 @@ namespace gfx {
// and mapped files if we have both release and nightlies
// running at the same time? Or...what if we have multiple
// release builds running on same machine? (Bug 1563232)
#define SHMEM_VERSION "0.0.6"
static const int32_t kVRExternalVersion = 13;
#define SHMEM_VERSION "0.0.7"
static const int32_t kVRExternalVersion = 14;

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

enum class VRTelemetryId : uint8_t {
NONE = 0,
INSTALLED_FROM = 1,
ENTRY_METHOD = 2,
FIRST_RUN = 3,
TOTAL = 4,
};

enum class VRTelemetryInstallFrom: uint8_t {
User = 0,
FxR = 1,
HTC = 2,
Valve = 3,
TOTAL = 4,
};

enum class VRTelemetryEntryMethod: uint8_t {
SystemBtn = 0,
Library = 1,
Gaze = 2,
TOTAL = 3,
};

struct VRTelemetryState {
uint32_t uid;

bool installedFrom : 1;
bool entryMethod : 1;
bool firstRun : 1;

uint8_t installedFromValue : 3;
uint8_t entryMethodValue : 3;
bool firstRunValue : 1;
};

struct VRExternalShmem {
int32_t version;
int32_t size;
Expand Down Expand Up @@ -570,6 +605,7 @@ struct VRExternalShmem {
#endif // !defined(__ANDROID__)
#if defined(XP_WIN)
VRWindowState windowState;
VRTelemetryState telemetryState;
#endif
#ifdef MOZILLA_INTERNAL_API
void Clear() volatile {
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
Expand Up @@ -24,7 +24,7 @@ ext.deps = [:]
def versions = [:]
// GeckoView versions can be found here:
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
versions.gecko_view = "73.0.20191220095035"
versions.gecko_view = "74.0.20200107095722"
versions.android_components = "21.0.0"
// Note that android-components also depends on application-services,
// and in fact is our main source of appservices-related functionality.
Expand Down

0 comments on commit 4a713bd

Please sign in to comment.