From 8e08e7974f9754a9cfeb4b136d42b9cc1cc44674 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Fri, 19 Jul 2019 18:46:40 -0700
Subject: [PATCH] Reduce false positive performance monitor detection

---
 app/build.gradle                                               | 3 ++-
 .../common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java | 2 +-
 app/src/main/cpp/BrowserWorld.cpp                              | 3 +++
 app/src/main/cpp/vrb                                           | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 67f9bcb79..7c2e73964 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -174,7 +174,8 @@ android {
             dimension "platform"
             externalNativeBuild {
                 cmake {
-                    cppFlags " -I" + file("${project.rootDir}/third_party/wavesdk/build/wvr_client/include").absolutePath
+                    cppFlags " -I" + file("${project.rootDir}/third_party/wavesdk/build/wvr_client/include").absolutePath +
+                            " -DWAVEVR"
                     arguments "-DVR_SDK_LIB=wavevr-lib", "-DWAVEVR=ON"
                 }
             }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
index f1f6e5611..6de0989c4 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -884,7 +884,7 @@ private void handlePoorPerformance() {
             mWindowWidget.showButtonPrompt(getString(R.string.performance_title), getString(R.string.performance_message), buttons, new GeckoSession.PromptDelegate.ButtonCallback() {
                 @Override
                 public void confirm(int button) {
-                    if (button == 0) {
+                    if (button == GeckoSession.PromptDelegate.BUTTON_TYPE_NEGATIVE) {
                         mPoorPerformanceWhiteList.add(originalUrl);
                         SessionStore.get().loadUri(originalUrl);
                     }
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
index 7ce6cb603..6a72c66be 100644
--- a/app/src/main/cpp/BrowserWorld.cpp
+++ b/app/src/main/cpp/BrowserWorld.cpp
@@ -206,6 +206,9 @@ struct BrowserWorld::State {
     splashAnimation = SplashAnimation::Create(create);
     monitor = PerformanceMonitor::Create(create);
     monitor->AddPerformanceMonitorObserver(std::make_shared<PerformanceObserver>());
+#if defined(WAVEVR)
+    monitor->SetPerformanceDelta(15.0);
+#endif
   }
 
   void CheckBackButton();
diff --git a/app/src/main/cpp/vrb b/app/src/main/cpp/vrb
index bb4354fa8..91444aa64 160000
--- a/app/src/main/cpp/vrb
+++ b/app/src/main/cpp/vrb
@@ -1 +1 @@
-Subproject commit bb4354fa8b2cbaae88e7bcc3b2d095341a0138a5
+Subproject commit 91444aa647913a52f3acc566d4d7cae248a7d31b