From 00433d418a34cd0d9f5fe8d7172d3c666c37d8a2 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 6 Dec 2017 12:19:24 -0800
Subject: [PATCH] Disable subpixel AA during the SVG benchmark

---
 demo/client/html/benchmark.html.hbs |  2 +-
 demo/client/src/app-controller.ts   | 12 ++++++------
 demo/client/src/benchmark.ts        | 13 +++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/demo/client/html/benchmark.html.hbs b/demo/client/html/benchmark.html.hbs
index 594807c5..f6c35302 100644
--- a/demo/client/html/benchmark.html.hbs
+++ b/demo/client/html/benchmark.html.hbs
@@ -42,7 +42,7 @@
                                     <div class="form-group" id="pf-aa-level-form-group">
                                         <label for="pf-aa-level-select"
                                         class="col-form-label mr-sm-2">Antialiasing</label>
-                                        <select id="pf-aa-level-select"
+                                        <select id="pf-aa-level-select" autocomplete="off"
                                         class="form-control custom-select mr-sm-3">
                                             <option value="none" selected>None</option>
                                             <option value="ssaa-2">2&times;SSAA</option>
diff --git a/demo/client/src/app-controller.ts b/demo/client/src/app-controller.ts
index 97147d4a..76e54965 100644
--- a/demo/client/src/app-controller.ts
+++ b/demo/client/src/app-controller.ts
@@ -245,12 +245,7 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
         this.fpsLabel.classList.remove('invisible');
     }
 
-    protected abstract createView(gammaLUT: HTMLImageElement,
-                                  commonShaderSource: string,
-                                  shaderSources: ShaderMap<ShaderProgramSource>):
-                                  View;
-
-    protected updateAALevel(): Promise<void> {
+    updateAALevel(): Promise<void> {
         let aaType: AntialiasingStrategyName, aaLevel: number;
         if (this.aaLevelSelect != null) {
             const selectedOption = this.aaLevelSelect.selectedOptions[0];
@@ -280,6 +275,11 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
         });
     }
 
+    protected abstract createView(gammaLUT: HTMLImageElement,
+                                  commonShaderSource: string,
+                                  shaderSources: ShaderMap<ShaderProgramSource>):
+                                  View;
+
     private initPopup(cardID: string, popupButtonID: string, closeButtonID: string): void {
         const card = document.getElementById(cardID) as HTMLElement | null;
         const button = document.getElementById(popupButtonID) as HTMLButtonElement | null;
diff --git a/demo/client/src/benchmark.ts b/demo/client/src/benchmark.ts
index 775a7108..04516574 100644
--- a/demo/client/src/benchmark.ts
+++ b/demo/client/src/benchmark.ts
@@ -164,14 +164,14 @@ class BenchmarkAppController extends DemoAppController<BenchmarkTestView> {
             if (aaLevelFormGroup.parentElement != null)
                 aaLevelFormGroup.parentElement.removeChild(aaLevelFormGroup);
             benchmarkTextForm.insertBefore(aaLevelFormGroup, benchmarkTextForm.firstChild);
-            this.loadInitialFile(this.builtinFileURI);
+            this.modeChanged();
         });
         window.jQuery(benchmarkSVGTab).on('shown.bs.tab', event => {
             this.mode = 'svg';
             if (aaLevelFormGroup.parentElement != null)
                 aaLevelFormGroup.parentElement.removeChild(aaLevelFormGroup);
             benchmarkSVGForm.insertBefore(aaLevelFormGroup, benchmarkSVGForm.firstChild);
-            this.loadInitialFile(this.builtinFileURI);
+            this.modeChanged();
         });
 
         this.loadInitialFile(this.builtinFileURI);
@@ -195,6 +195,15 @@ class BenchmarkAppController extends DemoAppController<BenchmarkTestView> {
         return new BenchmarkTestView(this, gammaLUT, commonShaderSource, shaderSources);
     }
 
+    private modeChanged(): void {
+        this.loadInitialFile(this.builtinFileURI);
+        if (this.aaLevelSelect != null)
+            this.aaLevelSelect.selectedIndex = 0;
+        if (this.subpixelAARadioButton != null)
+            this.subpixelAARadioButton.checked = false;
+        this.updateAALevel();
+    }
+
     private textFileLoaded(fileData: ArrayBuffer, builtinName: string | null): void {
         const font = new PathfinderFont(fileData, builtinName);
         this.font = font;