Add paint flags to viewer GUI.

Overriding bits of the paint was added with keyboard bindings but
without being reflected in the GUI. This adds these flags to the GUI.

Change-Id: I633801fb776248952afe7cbe8857676ef8b57135
Reviewed-on: https://skia-review.googlesource.com/121796
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index 2a8f12b..760e3b8 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -16,6 +16,7 @@
 #include "SkAnimTimer.h"
 #include "SkExecutor.h"
 #include "SkJSONCPP.h"
+#include "SkScan.h"
 #include "SkTouchGesture.h"
 #include "Slide.h"
 #include "StatsLayer.h"
@@ -63,10 +64,10 @@
             DeltaAAEnabled,
             DeltaAAForced,
         } fAntiAlias = AntiAliasState::Alias;
-        bool fOriginalSkUseAnalyticAA = false;
-        bool fOriginalSkForceAnalyticAA = false;
-        bool fOriginalSkUseDeltaAA = false;
-        bool fOriginalSkForceDeltaAA = false;
+        const bool fOriginalSkUseAnalyticAA = gSkUseAnalyticAA;
+        const bool fOriginalSkForceAnalyticAA = gSkForceAnalyticAA;
+        const bool fOriginalSkUseDeltaAA = gSkUseDeltaAA;
+        const bool fOriginalSkForceDeltaAA = gSkForceDeltaAA;
 
         bool fTextAlign = false;
         bool fCapType = false;