aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/viewer/Viewer.h
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2018-04-17 11:16:32 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-17 16:10:14 +0000
commita580fb3f9ec5c177e4e8f827f6aa14239f984121 (patch)
tree744abe49ed4ee2590f4ff9cd83d81e7791ecfeae /tools/viewer/Viewer.h
parent3101f65d6b415618fc052f30b15b59731ee95e5a (diff)
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>
Diffstat (limited to 'tools/viewer/Viewer.h')
-rw-r--r--tools/viewer/Viewer.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index 2a8f12b466..760e3b8520 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 @@ public:
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;