commit f09e35eb59e43dedc329d3d15065b3e2735b7936
author Brian Osman <brianosman@google.com> Fri Dec 15 14:48:09 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 15 20:09:29 2017 +0000
tree ba7031bceaefbbc70b7eca2dbb5a1de793f159b6
parent 746db42e2c07050d5d0a0db11bfdab441d57e8cd

Remove unnecessary includes from Viewer

Bug: skia:
Change-Id: I7b20db66a7eb5b549997fd4307e41937a8753921
Reviewed-on: https://skia-review.googlesource.com/86020
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index c184eec..19ecd42 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -14,32 +14,24 @@
 #include "SKPSlide.h"
 
 #include "GrContext.h"
-#include "SkATrace.h"
 #include "SkCanvas.h"
-#include "SkColorSpace_Base.h"
 #include "SkColorSpacePriv.h"
 #include "SkColorSpaceXformCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkCommonFlagsGpuThreads.h"
 #include "SkCommonFlagsPathRenderer.h"
-#include "SkDashPathEffect.h"
 #include "SkEventTracingPriv.h"
 #include "SkGraphics.h"
 #include "SkImagePriv.h"
-#include "SkMetaData.h"
-#include "SkOnce.h"
 #include "SkOSFile.h"
 #include "SkOSPath.h"
 #include "SkPictureRecorder.h"
-#include "SkRandom.h"
 #include "SkScan.h"
 #include "SkStream.h"
 #include "SkSurface.h"
-#include "SkSwizzle.h"
 #include "SkTaskGroup.h"
 #include "SkThreadedBMPDevice.h"
 #include "SkTime.h"
-#include "SkVertices.h"
 
 #include "imgui.h"
 
@@ -56,8 +48,6 @@
     return new Viewer(argc, argv, platformData);
 }
 
-static DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
-
 static DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
                "Multiple matches may be separated by spaces.\n"
@@ -207,18 +197,15 @@
 {
     SkGraphics::Init();
 
-    static SkOnce initPathRendererNames;
-    initPathRendererNames([]() {
-        gPathRendererNames[GpuPathRenderers::kAll] = "All Path Renderers";
-        gPathRendererNames[GpuPathRenderers::kDefault] =
-                "Default Ganesh Behavior (best path renderer, not including CCPR)";
-        gPathRendererNames[GpuPathRenderers::kStencilAndCover] = "NV_path_rendering";
-        gPathRendererNames[GpuPathRenderers::kMSAA] = "Sample shading";
-        gPathRendererNames[GpuPathRenderers::kSmall] = "Small paths (cached sdf or alpha masks)";
-        gPathRendererNames[GpuPathRenderers::kCoverageCounting] = "Coverage counting";
-        gPathRendererNames[GpuPathRenderers::kTessellating] = "Tessellating";
-        gPathRendererNames[GpuPathRenderers::kNone] = "Software masks";
-    });
+    gPathRendererNames[GpuPathRenderers::kAll] = "All Path Renderers";
+    gPathRendererNames[GpuPathRenderers::kDefault] =
+            "Default Ganesh Behavior (best path renderer, not including CCPR)";
+    gPathRendererNames[GpuPathRenderers::kStencilAndCover] = "NV_path_rendering";
+    gPathRendererNames[GpuPathRenderers::kMSAA] = "Sample shading";
+    gPathRendererNames[GpuPathRenderers::kSmall] = "Small paths (cached sdf or alpha masks)";
+    gPathRendererNames[GpuPathRenderers::kCoverageCounting] = "Coverage counting";
+    gPathRendererNames[GpuPathRenderers::kTessellating] = "Tessellating";
+    gPathRendererNames[GpuPathRenderers::kNone] = "Software masks";
 
     memset(fPaintTimes, 0, sizeof(fPaintTimes));
     memset(fFlushTimes, 0, sizeof(fFlushTimes));