From c7027ab03f2e8bab4c74bc1b047642622d3d682b Mon Sep 17 00:00:00 2001
From: jvanverth <jvanverth@google.com>
Date: Thu, 16 Jun 2016 09:52:35 -0700
Subject: Add samples to Viewer.

This adds support with animation, assuming the sample has
implemented onAnimate. Event handling has not been
implemented.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2056343004

Committed: https://skia.googlesource.com/skia/+/76963e73704a42a18c29d6fbdcccb566e5c67658
Review-Url: https://codereview.chromium.org/2056343004
---
 gyp/SampleApp.gyp | 123 +----------------------------------------------
 gyp/samples.gypi  | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gyp/viewer.gyp    |  32 +++++++++++--
 3 files changed, 168 insertions(+), 127 deletions(-)
 create mode 100644 gyp/samples.gypi

(limited to 'gyp')

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 45051af05b..347af56073 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -20,140 +20,20 @@
         '../gm',       # needed to pull gm.h
         '../samplecode', # To pull SampleApp.h and SampleCode.h
         '../tools/debugger',
-        '../tools',
-        '../experimental',
       ],
       'includes': [
         'gmslides.gypi',
+        'samples.gypi',
       ],
       'sources': [
         '../gm/gm.cpp',
-        '../samplecode/GMSampleView.h',
-        '../samplecode/GMSampleView.cpp',
-        '../samplecode/ClockFaceView.cpp',
-        '../samplecode/OverView.cpp',
-        '../samplecode/OverView.h',
-        '../samplecode/PerlinPatch.cpp',
-        '../samplecode/Sample2PtRadial.cpp',
-        '../samplecode/SampleAAClip.cpp',
-        '../samplecode/SampleAAGeometry.cpp',
-        '../samplecode/SampleAARects.cpp',
-        '../samplecode/SampleAARectModes.cpp',
-        '../samplecode/SampleAll.cpp',
-        '../samplecode/SampleAnimatedText.cpp',
-        '../samplecode/SampleAnimBlur.cpp',
         '../samplecode/SampleApp.cpp',
-        '../samplecode/SampleArc.cpp',
-        '../samplecode/SampleAtlas.cpp',
-        '../samplecode/SampleBigBlur.cpp',
-        '../samplecode/SampleBigGradient.cpp',
-        '../samplecode/SampleBitmapRect.cpp',
-        '../samplecode/SampleBlur.cpp',
-        '../samplecode/SampleCamera.cpp',
-        '../samplecode/SampleChart.cpp',
-        '../samplecode/SampleCircle.cpp',
-        '../samplecode/SampleClip.cpp',
-        '../samplecode/SampleClipDrawMatch.cpp',
-        '../samplecode/SampleClock.cpp',
-        '../samplecode/SampleCode.h',
-        '../samplecode/SampleColorFilter.cpp',
-        '../samplecode/SampleComplexClip.cpp',
-        '../samplecode/SampleConcavePaths.cpp',
-        '../samplecode/SampleDegenerateTwoPtRadials.cpp',
-        '../samplecode/SampleDither.cpp',
-        '../samplecode/SampleDitherBitmap.cpp',
-        '../samplecode/SampleEffects.cpp',
-        '../samplecode/SampleEmboss.cpp',
-        '../samplecode/SampleFatBits.cpp',
-        '../samplecode/SampleFillType.cpp',
-        '../samplecode/SampleFilter.cpp',
-        '../samplecode/SampleFilter2.cpp',
-        '../samplecode/SampleFilterQuality.cpp',
-        '../samplecode/SampleFilterFuzz.cpp',
-        '../samplecode/SampleFontCache.cpp',
-        '../samplecode/SampleFontScalerTest.cpp',
-        '../samplecode/SampleFuzz.cpp',
-        '../samplecode/SampleGradients.cpp',
-        '../samplecode/SampleHairCurves.cpp',
-        '../samplecode/SampleHairline.cpp',
-        '../samplecode/SampleHairModes.cpp',
-        '../samplecode/SampleHT.cpp',
-        '../samplecode/SampleIdentityScale.cpp',
-        '../samplecode/SampleLayerMask.cpp',
-        '../samplecode/SampleLayers.cpp',
-        '../samplecode/SampleLCD.cpp',
-        '../samplecode/SampleLighting.cpp',
-        '../samplecode/SampleLines.cpp',
-        '../samplecode/SampleLitAtlas.cpp',
-        '../samplecode/SampleLua.cpp',
-        '../samplecode/SampleManyRects.cpp',
-        '../samplecode/SampleMeasure.cpp',
-        '../samplecode/SampleMegaStroke.cpp',
-        '../samplecode/SamplePatch.cpp',
-        '../samplecode/SamplePath.cpp',
-        '../samplecode/SamplePathClip.cpp',
-        '../samplecode/SamplePathFuzz.cpp',
-        '../samplecode/SamplePathEffects.cpp',
-        '../samplecode/SamplePathOverstroke.cpp',
-        '../samplecode/SamplePictFile.cpp',
-        '../samplecode/SamplePoints.cpp',
-        '../samplecode/SamplePolyToPoly.cpp',
-        '../samplecode/SampleQuadStroker.cpp',
-        '../samplecode/SampleRectanizer.cpp',
-        '../samplecode/SampleRegion.cpp',
-        '../samplecode/SampleRepeatTile.cpp',
-        '../samplecode/SampleShaders.cpp',
-        '../samplecode/SampleShaderText.cpp',
-        '../samplecode/SampleShip.cpp',
-        '../samplecode/SampleSkLayer.cpp',
-        '../samplecode/SampleSlides.cpp',
-        '../samplecode/SampleStringArt.cpp',
-        '../samplecode/SampleStrokePath.cpp',
-        '../samplecode/SampleSubpixelTranslate.cpp',
-        '../samplecode/SampleText.cpp',
-        '../samplecode/SampleTextAlpha.cpp',
-        '../samplecode/SampleTextBox.cpp',
-        '../samplecode/SampleTextOnPath.cpp',
-        '../samplecode/SampleTextureDomain.cpp',
-        '../samplecode/SampleTiling.cpp',
-        '../samplecode/SampleTinyBitmap.cpp',
-        '../samplecode/SampleUnpremul.cpp',
-        '../samplecode/SampleVertices.cpp',
-        '../samplecode/SampleXfermodesBlur.cpp',
-        '../samplecode/SampleXfer.cpp',
 
-        # DrawingBoard
-        #'../experimental/DrawingBoard/SkColorPalette.h',
-        #'../experimental/DrawingBoard/SkColorPalette.cpp',
-        #'../experimental/DrawingBoard/SkNetPipeController.h',
-        #'../experimental/DrawingBoard/SkNetPipeController.cpp',
-        #'../experimental/DrawingBoard/SampleDrawingClient.cpp',
-        #'../experimental/DrawingBoard/SampleDrawingServer.cpp',
-
-        # Networking
-        #'../experimental/Networking/SampleNetPipeReader.cpp',
-        #'../experimental/Networking/SkSockets.cpp',
-        #'../experimental/Networking/SkSockets.h',
-
-        # PerlinNoise2
-        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp',
-        '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h',
-
-        # Lua
-        '../src/utils/SkLuaCanvas.cpp',
-        '../src/utils/SkLua.cpp',
-      ],
-      'sources!': [
-        '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
-        '../samplecode/SampleFontCache.cpp',
       ],
       'dependencies': [
         'etc1.gyp:libetc1',
-        'experimental.gyp:experimental',
         'flags.gyp:flags',
         'jsoncpp.gyp:jsoncpp',
-        'lua.gyp:lua',
-        'pdf.gyp:pdf',
         'skia_lib.gyp:skia_lib',
         'gputest.gyp:skgputest',
         'tools.gyp:resources',
@@ -161,7 +41,6 @@
         'tools.gyp:timer',
         'tools.gyp:url_data_manager',
         'views.gyp:views',
-        'xml.gyp:xml',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
diff --git a/gyp/samples.gypi b/gyp/samples.gypi
new file mode 100644
index 0000000000..5a130d9713
--- /dev/null
+++ b/gyp/samples.gypi
@@ -0,0 +1,140 @@
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# Include this gypi to include all 'sample' files
+{
+  'include_dirs': [
+    '../include/views',
+    '../experimental',
+    '../samplecode',
+    '../tools',
+  ],
+  'sources': [
+    # Samples
+    '../samplecode/GMSampleView.h',
+    '../samplecode/GMSampleView.cpp',
+    '../samplecode/ClockFaceView.cpp',
+    '../samplecode/OverView.cpp',
+    '../samplecode/OverView.h',
+    '../samplecode/PerlinPatch.cpp',
+    '../samplecode/Sample2PtRadial.cpp',
+    '../samplecode/SampleAAClip.cpp',
+    '../samplecode/SampleAAGeometry.cpp',
+    '../samplecode/SampleAARects.cpp',
+    '../samplecode/SampleAARectModes.cpp',
+    '../samplecode/SampleAll.cpp',
+    '../samplecode/SampleAnimatedText.cpp',
+    '../samplecode/SampleAnimBlur.cpp',
+    '../samplecode/SampleArc.cpp',
+    '../samplecode/SampleAtlas.cpp',
+    '../samplecode/SampleBigBlur.cpp',
+    '../samplecode/SampleBigGradient.cpp',
+    '../samplecode/SampleBitmapRect.cpp',
+    '../samplecode/SampleBlur.cpp',
+    '../samplecode/SampleCamera.cpp',
+    '../samplecode/SampleChart.cpp',
+    '../samplecode/SampleCircle.cpp',
+    '../samplecode/SampleClip.cpp',
+    '../samplecode/SampleClipDrawMatch.cpp',
+    '../samplecode/SampleClock.cpp',
+    '../samplecode/SampleCode.cpp',
+    '../samplecode/SampleCode.h',
+    '../samplecode/SampleColorFilter.cpp',
+    '../samplecode/SampleComplexClip.cpp',
+    '../samplecode/SampleConcavePaths.cpp',
+    '../samplecode/SampleDegenerateTwoPtRadials.cpp',
+    '../samplecode/SampleDither.cpp',
+    '../samplecode/SampleDitherBitmap.cpp',
+    '../samplecode/SampleEffects.cpp',
+    '../samplecode/SampleEmboss.cpp',
+    '../samplecode/SampleFatBits.cpp',
+    '../samplecode/SampleFillType.cpp',
+    '../samplecode/SampleFilter.cpp',
+    '../samplecode/SampleFilter2.cpp',
+    '../samplecode/SampleFilterQuality.cpp',
+    '../samplecode/SampleFilterFuzz.cpp',
+    '../samplecode/SampleFontCache.cpp',
+    '../samplecode/SampleFontScalerTest.cpp',
+    '../samplecode/SampleFuzz.cpp',
+    '../samplecode/SampleGradients.cpp',
+    '../samplecode/SampleHairCurves.cpp',
+    '../samplecode/SampleHairline.cpp',
+    '../samplecode/SampleHairModes.cpp',
+    '../samplecode/SampleHT.cpp',
+    '../samplecode/SampleIdentityScale.cpp',
+    '../samplecode/SampleLayerMask.cpp',
+    '../samplecode/SampleLayers.cpp',
+    '../samplecode/SampleLCD.cpp',
+    '../samplecode/SampleLighting.cpp',
+    '../samplecode/SampleLines.cpp',
+    '../samplecode/SampleLitAtlas.cpp',
+    '../samplecode/SampleLua.cpp',
+    '../samplecode/SampleManyRects.cpp',
+    '../samplecode/SampleMeasure.cpp',
+    '../samplecode/SampleMegaStroke.cpp',
+    '../samplecode/SamplePatch.cpp',
+    '../samplecode/SamplePath.cpp',
+    '../samplecode/SamplePathClip.cpp',
+    '../samplecode/SamplePathFuzz.cpp',
+    '../samplecode/SamplePathEffects.cpp',
+    '../samplecode/SamplePictFile.cpp',
+    '../samplecode/SamplePoints.cpp',
+    '../samplecode/SamplePolyToPoly.cpp',
+    '../samplecode/SampleQuadStroker.cpp',
+    '../samplecode/SampleRectanizer.cpp',
+    '../samplecode/SampleRegion.cpp',
+    '../samplecode/SampleRepeatTile.cpp',
+    '../samplecode/SampleShaders.cpp',
+    '../samplecode/SampleShaderText.cpp',
+    '../samplecode/SampleShip.cpp',
+    '../samplecode/SampleSkLayer.cpp',
+    '../samplecode/SampleSlides.cpp',
+    '../samplecode/SampleStringArt.cpp',
+    '../samplecode/SampleStrokePath.cpp',
+    '../samplecode/SampleSubpixelTranslate.cpp',
+    '../samplecode/SampleText.cpp',
+    '../samplecode/SampleTextAlpha.cpp',
+    '../samplecode/SampleTextBox.cpp',
+    '../samplecode/SampleTextOnPath.cpp',
+    '../samplecode/SampleTextureDomain.cpp',
+    '../samplecode/SampleTiling.cpp',
+    '../samplecode/SampleTinyBitmap.cpp',
+    '../samplecode/SampleUnpremul.cpp',
+    '../samplecode/SampleVertices.cpp',
+    '../samplecode/SampleXfermodesBlur.cpp',
+    '../samplecode/SampleXfer.cpp',
+	
+    # DrawingBoard
+    #'../experimental/DrawingBoard/SkColorPalette.h',
+    #'../experimental/DrawingBoard/SkColorPalette.cpp',
+    #'../experimental/DrawingBoard/SkNetPipeController.h',
+    #'../experimental/DrawingBoard/SkNetPipeController.cpp',
+    #'../experimental/DrawingBoard/SampleDrawingClient.cpp',
+    #'../experimental/DrawingBoard/SampleDrawingServer.cpp',
+
+    # Networking
+    #'../experimental/Networking/SampleNetPipeReader.cpp',
+    #'../experimental/Networking/SkSockets.cpp',
+    #'../experimental/Networking/SkSockets.h',
+
+    # PerlinNoise2
+    '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp',
+    '../experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h',
+
+    # Lua
+    '../src/utils/SkLuaCanvas.cpp',
+    '../src/utils/SkLua.cpp',
+  ],
+  'sources!': [
+    '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compi    
+    '../samplecode/SampleFontCache.cpp', #relies on pthread.h
+  ],      
+  'dependencies': [
+    'experimental.gyp:experimental',
+    'lua.gyp:lua',
+    'pdf.gyp:pdf',
+    'views.gyp:views',
+    'xml.gyp:xml',
+  ],
+}
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index 1013e070ae..012281a68e 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -14,26 +14,41 @@
       'type': 'executable',
       'includes' : [
         'gmslides.gypi',
+        'samples.gypi',
       ],
       'include_dirs': [
         '../bench',
         '../gm',
-        '../include/views',
         '../include/private',
         '../src/core',
         '../src/effects',
         '../src/gpu',
-        '../src/images',
         '../src/image',
+        '../src/images',
+        '../src/pathops',
         '../src/views/unix',
         '../tools/timer',
       ],
       'sources': [
         '../gm/gm.cpp',
+        '<!@(python find.py ../tools/viewer "*.cpp")',
+
+        # views (subset of files for the Android build)
+        '../src/views/SkEvent.cpp',
+        '../src/views/SkEventSink.cpp',
+        '../src/views/SkOSMenu.cpp',
+        '../src/views/SkTagList.cpp',
+        '../src/views/SkTagList.h',
         '../src/views/SkTouchGesture.cpp',
+        '../src/views/SkView.cpp',
+        '../src/views/SkViewPriv.cpp',
+        '../src/views/SkViewPriv.h',
         '../src/views/unix/keysym2ucs.c',
-        '<!@(python find.py ../tools/viewer "*.cpp")',
       ],
+      'sources!': [
+        '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
+        '../samplecode/SampleFontCache.cpp', #relies on pthread.h
+      ],      
       'dependencies': [
         'flags.gyp:flags',
         'gputest.gyp:skgputest',
@@ -52,6 +67,11 @@
             'android_deps.gyp:Android_EntryPoint',
             'android_deps.gyp:native_app_glue',
           ],
+          # views depends on SkOSWindow_android, which we don't want to include
+          # so we only include the minimum set of views files in sources
+          'dependencies!': [
+            'views.gyp:views',
+          ],
           'link_settings': {
             'libraries': [
               '-landroid',
@@ -66,11 +86,13 @@
           },
         }],
         ['skia_os != "android"', {
-          'sources/': [ ['exclude', '_android.(h|cpp)$'],
+          'sources/': [
+            ['exclude', '_android.(h|cpp)$'],
+            ['exclude', 'src/views'],
           ],
         }],
         ['skia_os != "linux"', {
-          'sources/': [ 
+          'sources/': [
             ['exclude', '_unix.(h|cpp)$'],
             ['exclude', 'keysym2ucs.c'],
           ],
-- 
cgit v1.2.3