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

Bump GV to 71.0.20191018095340 #2018

Merged
merged 1 commit into from
Oct 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion app/src/main/cpp/moz_external_vr.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ enum class GamepadCapabilityFlags : uint16_t;
#endif // MOZILLA_INTERNAL_API
namespace gfx {

static const int32_t kVRExternalVersion = 9;
// If there is any change of "SHMEM_VERSION" or "kVRExternalVersion",
// we need to change both of them at the same time.

// TODO: we might need to use different names for the mutexes
// 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.3"
static const int32_t kVRExternalVersion = 10;

// We assign VR presentations to groups with a bitmask.
// Currently, we will only display either content or chrome.
Expand Down Expand Up @@ -430,13 +438,25 @@ struct VRSystemState {
VRControllerState controllerState[kVRControllerMaxCount];
};

enum class VRFxEventType : uint8_t {
FxEvent_NONE = 0,
FxEvent_IME,
FxEvent_SHUTDOWN,
FxEvent_TOTAL
};

enum class VRFxIMEState : uint8_t { Blur, Focus };

// Data shared via shmem for running Firefox in a VR windowed environment
struct VRWindowState {
// State from Firefox
uint64_t hwndFx;
uint32_t widthFx;
uint32_t heightFx;
VRLayerTextureHandle textureFx;
uint32_t windowID;
VRFxEventType eventType;
VRFxIMEState imeState;

// State from VRHost
uint32_t dxgiAdapterHost;
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
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 = "71.0.20191014095234"
versions.gecko_view = "71.0.20191018095340"
versions.android_components = "4.0.0"
versions.mozilla_speech = "1.0.6"
versions.openwnn = "1.3.7"
Expand Down