commit dbb24efcc5f224a0d9a73ad9b200daf8013df0a1
author Jim Van Verth <jvanverth@google.com> Fri Sep 01 11:01:51 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 01 17:30:57 2017 +0000
tree 755251b59a15a044d40737ccb0b59b80e926e4bc
parent 4b277b9b66abffa024732a2e12b5a5b13f3d9168

Get viewer running on iOS

Bug: skia:
Change-Id: Ic8b25ca2ecf51cfc190ac01bc9282396905a33b3
Reviewed-on: https://skia-review.googlesource.com/40862
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e7a495a..845feef 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1185,6 +1185,8 @@
       ]
     } else if (is_win) {
       sources += [ "src/views/win/SkOSWindow_win.cpp" ]
+    } else if (is_ios) {
+      sources += [ "src/views/mac/SkEventNotifier.mm" ]
     }
     if (skia_use_angle) {
       deps += [ "//third_party/angle2" ]
@@ -1556,7 +1558,7 @@
     ]
   }
 
-  if (skia_enable_gpu && (is_android || is_linux || is_win || is_mac)) {
+  if (skia_enable_gpu) {
     test_app("viewer") {
       is_shared_library = is_android
       sources = [
@@ -1604,6 +1606,13 @@
           "tools/viewer/sk_app/mac/Window_mac.cpp",
           "tools/viewer/sk_app/mac/main_mac.cpp",
         ]
+      } else if (is_ios) {
+        sources += [
+          "tools/viewer/sk_app/ios/GLWindowContext_ios.cpp",
+          "tools/viewer/sk_app/ios/RasterWindowContext_ios.cpp",
+          "tools/viewer/sk_app/ios/Window_ios.cpp",
+          "tools/viewer/sk_app/ios/main_ios.cpp",
+        ]
       }
 
       if (skia_use_vulkan) {
@@ -1633,7 +1642,7 @@
       ]
       if (is_android) {
         deps += [ "//third_party/native_app_glue" ]
-      } else if (is_mac) {
+      } else if (is_mac || is_ios) {
         deps += [ "//third_party/libsdl" ]
       }
       if (skia_use_angle) {