Reduce false positive performance monitor detection (#1438)

MozillaReality · Jul 29, 2019 · 0298c68 · 0298c68
1 parent aac311f
commit 0298c68
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
+4 −0		include/vrb/PerformanceMonitor.h
+92 −48		src/PerformanceMonitor.cpp
+12 −8		src/RenderContext.cpp