Rename VulkanViewer to Viewer, take 2.

Also puts Window and Application in sk_app namespace.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003

Review-Url: https://codereview.chromium.org/1945103003

22 files changed, 61 insertions, 29 deletions

diff --git a/tools/vulkan/Application.h b/tools/viewer/Application.h
index 4504d177e4..235ff09ed4 100644
--- a/tools/vulkan/Application.h
+++ b/tools/viewer/Application.h
@@ -8,6 +8,8 @@
 #ifndef Application_DEFINED
 #define Application_DEFINED
 
+namespace sk_app {
+
 class Application {
 public:
     static Application* Create(int argc, char** argv, void* platformData);
@@ -17,4 +19,6 @@ public:
     virtual void onIdle(double ms) = 0;
 };
 
+}   // namespace sk_app
+
 #endif
diff --git a/tools/vulkan/VulkanTestContext.cpp b/tools/viewer/VulkanTestContext.cpp
index e9137c0ee3..e9137c0ee3 100644
--- a/tools/vulkan/VulkanTestContext.cpp
+++ b/tools/viewer/VulkanTestContext.cpp
diff --git a/tools/vulkan/VulkanTestContext.h b/tools/viewer/VulkanTestContext.h
index 60b3b80cf4..60b3b80cf4 100644
--- a/tools/vulkan/VulkanTestContext.h
+++ b/tools/viewer/VulkanTestContext.h
diff --git a/tools/vulkan/Window.cpp b/tools/viewer/Window.cpp
index 9042a0cb69..6a83a3ba81 100644
--- a/tools/vulkan/Window.cpp
+++ b/tools/viewer/Window.cpp
@@ -11,6 +11,8 @@
 #include "SkCanvas.h"
 #include "VulkanTestContext.h"
 
+namespace sk_app {
+
 static bool default_char_func(SkUnichar c, uint32_t modifiers, void* userData) {
     return false;
 }
@@ -72,3 +74,5 @@ void Window::onResize(uint32_t w, uint32_t h) {
     fHeight = h;
     fTestContext->resize(w, h);
 }
+
+}   // namespace sk_app
diff --git a/tools/vulkan/Window.h b/tools/viewer/Window.h
index 714d8df500..913d2da00a 100644
--- a/tools/vulkan/Window.h
+++ b/tools/viewer/Window.h
@@ -14,6 +14,8 @@
 class SkCanvas;
 class VulkanTestContext;
 
+namespace sk_app {
+
 class Window {
 public:
     static Window* CreateNativeWindow(void* platformData);
@@ -144,5 +146,5 @@ protected:
     VulkanTestContext* fTestContext;
 };
 
-
+}   // namespace sk_app
 #endif
diff --git a/tools/vulkan/android/VulkanTestContext_android.cpp b/tools/viewer/android/VulkanTestContext_android.cpp
index 58dbcb2843..58dbcb2843 100644
--- a/tools/vulkan/android/VulkanTestContext_android.cpp
+++ b/tools/viewer/android/VulkanTestContext_android.cpp
diff --git a/tools/vulkan/android/VulkanTestContext_android.h b/tools/viewer/android/VulkanTestContext_android.h
index 66ed35c2f6..66ed35c2f6 100644
--- a/tools/vulkan/android/VulkanTestContext_android.h
+++ b/tools/viewer/android/VulkanTestContext_android.h
diff --git a/tools/vulkan/android/Window_android.cpp b/tools/viewer/android/Window_android.cpp
index 87a4d22a3f..ebccb8beff 100644
--- a/tools/vulkan/android/Window_android.cpp
+++ b/tools/viewer/android/Window_android.cpp
@@ -9,6 +9,8 @@
 
 #include "VulkanTestContext_android.h"
 
+namespace sk_app {
+
 Window* Window::CreateNativeWindow(void* platformData) {
     Window_android* window = new Window_android();
     if (!window->init((android_app*)platformData)) {
@@ -61,7 +63,7 @@ static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
 }
 
 void Window_android::inval() {
-	android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
+    android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
 }
 
 void Window_android::paintIfNeeded() {
@@ -149,7 +151,7 @@ static int32_t get_key_modifiers(AInputEvent* event) {
     int32_t modifiers = 0;
 
     if (AKeyEvent_getRepeatCount(event) == 0) {
-    	modifiers |= Window::kFirstPress_ModifierKey;
+        modifiers |= Window::kFirstPress_ModifierKey;
     }
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gPair); i++) {
@@ -177,3 +179,5 @@ static int32_t handle_input(struct android_app* app, AInputEvent* event) {
     }
     return 0;
 }
+
+}   // namespace sk_app
diff --git a/tools/vulkan/android/Window_android.h b/tools/viewer/android/Window_android.h
index fa675feb32..6099f8983e 100644
--- a/tools/vulkan/android/Window_android.h
+++ b/tools/viewer/android/Window_android.h
@@ -11,6 +11,8 @@
 #include "../Window.h"
 #include <android_native_app_glue.h>
 
+namespace sk_app {
+
 enum {
     /**
      * Leave plenty of space between this item and the ones defined in the glue layer
@@ -45,4 +47,6 @@ private:
     int mSampleCount = 0;
 };
 
+}   // namespace sk_app
+
 #endif
diff --git a/tools/vulkan/android/main_android.cpp b/tools/viewer/android/main_android.cpp
index 783cd1f783..9334f0ccd3 100644
--- a/tools/vulkan/android/main_android.cpp
+++ b/tools/viewer/android/main_android.cpp
@@ -15,6 +15,8 @@
 
 static double now_ms() { return SkTime::GetNSecs() * 1e-6; }
 
+using sk_app::Application;
+
 /**
  * This is the main entry point of a native application that is using
  * android_native_app_glue.  It runs in its own thread, with its own
@@ -25,7 +27,7 @@ void android_main(struct android_app* state) {
     app_dummy();
 
     static const char* gCmdLine[] = {
-        "vulkanviewer",
+        "viewer",
         "--skps",
         "/data/local/tmp/skp",
     };
diff --git a/tools/vulkan/viewer/GMSlide.cpp b/tools/viewer/viewer/GMSlide.cpp
index 6096044a38..6096044a38 100644
--- a/tools/vulkan/viewer/GMSlide.cpp
+++ b/tools/viewer/viewer/GMSlide.cpp
diff --git a/tools/vulkan/viewer/GMSlide.h b/tools/viewer/viewer/GMSlide.h
index 6b03527202..6b03527202 100644
--- a/tools/vulkan/viewer/GMSlide.h
+++ b/tools/viewer/viewer/GMSlide.h
diff --git a/tools/vulkan/viewer/SKPSlide.cpp b/tools/viewer/viewer/SKPSlide.cpp
index 6a9899b92f..6a9899b92f 100644
--- a/tools/vulkan/viewer/SKPSlide.cpp
+++ b/tools/viewer/viewer/SKPSlide.cpp
diff --git a/tools/vulkan/viewer/SKPSlide.h b/tools/viewer/viewer/SKPSlide.h
index 42845fa30d..42845fa30d 100644
--- a/tools/vulkan/viewer/SKPSlide.h
+++ b/tools/viewer/viewer/SKPSlide.h
diff --git a/tools/vulkan/viewer/Slide.h b/tools/viewer/viewer/Slide.h
index cdc225b0a8..cdc225b0a8 100644
--- a/tools/vulkan/viewer/Slide.h
+++ b/tools/viewer/viewer/Slide.h
diff --git a/tools/vulkan/viewer/VulkanViewer.cpp b/tools/viewer/viewer/Viewer.cpp
index 79c49685eb..ededc1f1c1 100644
--- a/tools/vulkan/viewer/VulkanViewer.cpp
+++ b/tools/viewer/viewer/Viewer.cpp
@@ -5,7 +5,7 @@
 * found in the LICENSE file.
 */
 
-#include "VulkanViewer.h"
+#include "Viewer.h"
 
 #include "GMSlide.h"
 #include "SKPSlide.h"
@@ -16,25 +16,27 @@
 #include "SkRandom.h"
 #include "SkStream.h"
 
+using namespace sk_app;
+
 Application* Application::Create(int argc, char** argv, void* platformData) {
-    return new VulkanViewer(argc, argv, platformData);
+    return new Viewer(argc, argv, platformData);
 }
 
 static bool on_key_handler(Window::Key key, Window::InputState state, uint32_t modifiers,
                            void* userData) {
-    VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+    Viewer* vv = reinterpret_cast<Viewer*>(userData);
 
     return vv->onKey(key, state, modifiers);
 }
 
 static bool on_char_handler(SkUnichar c, uint32_t modifiers, void* userData) {
-    VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+    Viewer* vv = reinterpret_cast<Viewer*>(userData);
 
     return vv->onChar(c, modifiers);
 }
 
 static void on_paint_handler(SkCanvas* canvas, void* userData) {
-    VulkanViewer* vv = reinterpret_cast<VulkanViewer*>(userData);
+    Viewer* vv = reinterpret_cast<Viewer*>(userData);
 
     return vv->onPaint(canvas);
 }
@@ -52,7 +54,7 @@ DEFINE_string2(match, m, nullptr,
                "it is skipped unless some list entry starts with ~");
 DEFINE_string(skps, "skps", "Directory to read skps from.");
 
-VulkanViewer::VulkanViewer(int argc, char** argv, void* platformData)
+Viewer::Viewer(int argc, char** argv, void* platformData)
     : fCurrentMeasurement(0)
     , fDisplayStats(false)
     , fZoomCenterX(0.0f)
@@ -91,7 +93,7 @@ VulkanViewer::VulkanViewer(int argc, char** argv, void* platformData)
     fWindow->show();
 }
 
-void VulkanViewer::initSlides() {
+void Viewer::initSlides() {
     const skiagm::GMRegistry* gms(skiagm::GMRegistry::Head());
     while (gms) {
         SkAutoTDelete<skiagm::GM> gm(gms->factory()(nullptr));
@@ -142,13 +144,13 @@ void VulkanViewer::initSlides() {
 }
 
 
-VulkanViewer::~VulkanViewer() {
+Viewer::~Viewer() {
     fWindow->detach();
     delete fWindow;
 }
 
-void VulkanViewer::setupCurrentSlide(int previousSlide) {
-    SkString title("VulkanViewer: ");
+void Viewer::setupCurrentSlide(int previousSlide) {
+    SkString title("Viewer: ");
     title.append(fSlides[fCurrentSlide]->getName());
     fSlides[fCurrentSlide]->load();
     if (previousSlide >= 0) {
@@ -161,7 +163,7 @@ void VulkanViewer::setupCurrentSlide(int previousSlide) {
 #define MAX_ZOOM_LEVEL  8
 #define MIN_ZOOM_LEVEL  -8
 
-void VulkanViewer::changeZoomLevel(float delta) {
+void Viewer::changeZoomLevel(float delta) {
     fZoomLevel += delta;
     if (fZoomLevel > 0) {
         fZoomLevel = SkMinScalar(fZoomLevel, MAX_ZOOM_LEVEL);
@@ -175,7 +177,7 @@ void VulkanViewer::changeZoomLevel(float delta) {
     this->updateMatrix();
 }
 
-void VulkanViewer::updateMatrix(){
+void Viewer::updateMatrix(){
     SkMatrix m;
     m.reset();
 
@@ -199,7 +201,7 @@ void VulkanViewer::updateMatrix(){
     fLocalMatrix = m;
 }
 
-bool VulkanViewer::onKey(Window::Key key, Window::InputState state, uint32_t modifiers) {
+bool Viewer::onKey(Window::Key key, Window::InputState state, uint32_t modifiers) {
     if (Window::kDown_InputState == state) {
         switch (key) {
             case Window::kRight_Key: {
@@ -218,7 +220,7 @@ bool VulkanViewer::onKey(Window::Key key, Window::InputState state, uint32_t mod
                 if (fCurrentSlide < 0) {
                     fCurrentSlide = fSlides.count() - 1;
                 }
-                SkString title("VulkanViewer: ");
+                SkString title("Viewer: ");
                 title.append(fSlides[fCurrentSlide]->getName());
                 fWindow->setTitle(title.c_str());
                 setupCurrentSlide(previousSlide);
@@ -245,7 +247,7 @@ bool VulkanViewer::onKey(Window::Key key, Window::InputState state, uint32_t mod
     return false;
 }
 
-bool VulkanViewer::onChar(SkUnichar c, uint32_t modifiers) {
+bool Viewer::onChar(SkUnichar c, uint32_t modifiers) {
     if ('s' == c) {
         fDisplayStats = !fDisplayStats;
         return true;
@@ -254,7 +256,7 @@ bool VulkanViewer::onChar(SkUnichar c, uint32_t modifiers) {
     return false;
 }
 
-void VulkanViewer::onPaint(SkCanvas* canvas) {
+void Viewer::onPaint(SkCanvas* canvas) {
 
     int count = canvas->save();
 
@@ -283,7 +285,7 @@ void VulkanViewer::onPaint(SkCanvas* canvas) {
     }
 }
 
-void VulkanViewer::drawStats(SkCanvas* canvas) {
+void Viewer::drawStats(SkCanvas* canvas) {
     static const float kPixelPerMS = 2.0f;
     static const int kDisplayWidth = 130;
     static const int kDisplayHeight = 100;
@@ -331,7 +333,7 @@ void VulkanViewer::drawStats(SkCanvas* canvas) {
     canvas->restore();
 }
 
-void VulkanViewer::onIdle(double ms) {
+void Viewer::onIdle(double ms) {
     // Record measurements
     fMeasurements[fCurrentMeasurement++] = ms;
     fCurrentMeasurement &= (kMeasurementCount - 1);  // fast mod
diff --git a/tools/vulkan/viewer/VulkanViewer.h b/tools/viewer/viewer/Viewer.h
index 7e39f88a76..43d29baa96 100644
--- a/tools/vulkan/viewer/VulkanViewer.h
+++ b/tools/viewer/viewer/Viewer.h
@@ -5,8 +5,8 @@
 * found in the LICENSE file.
 */
 
-#ifndef VulkanViewer_DEFINED
-#define VulkanViewer_DEFINED
+#ifndef Viewer_DEFINED
+#define Viewer_DEFINED
 
 #include "../Application.h"
 #include "../Window.h"
@@ -16,12 +16,12 @@
 
 class SkCanvas;
 
-class VulkanViewer : public Application {
+class Viewer : public sk_app::Application {
 public:
-    VulkanViewer(int argc, char** argv, void* platformData);
-    ~VulkanViewer() override;
+    Viewer(int argc, char** argv, void* platformData);
+    ~Viewer() override;
 
-    bool onKey(Window::Key key, Window::InputState state, uint32_t modifiers);
+    bool onKey(sk_app::Window::Key key, sk_app::Window::InputState state, uint32_t modifiers);
     bool onChar(SkUnichar, uint32_t modifiers);
     void onPaint(SkCanvas* canvas);
     void onIdle(double ms) override;
@@ -35,7 +35,7 @@ private:
     void changeZoomLevel(float delta);
     void updateMatrix();
 
-    Window*      fWindow;
+    sk_app::Window*        fWindow;
 
     static const int kMeasurementCount = 64;  // should be power of 2 for fast mod
     double fMeasurements[kMeasurementCount];
diff --git a/tools/vulkan/win/VulkanTestContext_win.cpp b/tools/viewer/win/VulkanTestContext_win.cpp
index 37ef667429..37ef667429 100644
--- a/tools/vulkan/win/VulkanTestContext_win.cpp
+++ b/tools/viewer/win/VulkanTestContext_win.cpp
diff --git a/tools/vulkan/win/VulkanTestContext_win.h b/tools/viewer/win/VulkanTestContext_win.h
index 59b5c2cfd6..59b5c2cfd6 100644
--- a/tools/vulkan/win/VulkanTestContext_win.h
+++ b/tools/viewer/win/VulkanTestContext_win.h
diff --git a/tools/vulkan/win/Window_win.cpp b/tools/viewer/win/Window_win.cpp
index 58224d6d51..d5711b7245 100644
--- a/tools/vulkan/win/Window_win.cpp
+++ b/tools/viewer/win/Window_win.cpp
@@ -14,6 +14,8 @@
 #include "SkUtils.h"
 #include "VulkanTestContext_win.h"
 
+namespace sk_app {
+
 Window* Window::CreateNativeWindow(void* platformData) {
     HINSTANCE hInstance = (HINSTANCE)platformData;
 
@@ -279,3 +281,5 @@ bool Window_win::attach(BackEndType attachType, int msaaSampleCount) {
 void Window_win::inval() {
     InvalidateRect(fHWnd, nullptr, false);
 }
+
+}   // namespace sk_app
diff --git a/tools/vulkan/win/Window_win.h b/tools/viewer/win/Window_win.h
index 127fa133ec..e295212f31 100644
--- a/tools/vulkan/win/Window_win.h
+++ b/tools/viewer/win/Window_win.h
@@ -11,6 +11,8 @@
 #include <windows.h>
 #include "../Window.h"
 
+namespace sk_app {
+
 class Window_win : public Window {
 public:
     Window_win() : Window() {}
@@ -30,4 +32,6 @@ private:
     HWND      fHWnd;
 };
 
+}   // namespace sk_app
+
 #endif
diff --git a/tools/vulkan/win/main_win.cpp b/tools/viewer/win/main_win.cpp
index c2ad6dabbf..ba1629c837 100644
--- a/tools/vulkan/win/main_win.cpp
+++ b/tools/viewer/win/main_win.cpp
@@ -13,6 +13,8 @@
 #include "Window_win.h"
 #include "../Application.h"
 
+using sk_app::Application;
+
 static char* tchar_to_utf8(const TCHAR* str) {
 #ifdef _UNICODE
     int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), NULL, 0, NULL, NULL);