Add samples to Viewer.

gyp/SampleApp.gyp

Index: gyp/SampleApp.gyp
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 45051af05bc15572cf7677b5b125e9f30a0546f0..347af56073c1df5c4316236f3c1cac67f7d150bb 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': {