Revert of Add samples to Viewer. (patchset #4 id:60001 of https://codereview.chromium.org/2056343004/ )
Reason for revert:
breaking on android compile
Original issue's description:
> 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
TBR=bsalomon@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2063883002
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index c15e1d9..1013e07 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -17,141 +17,27 @@
],
'include_dirs': [
'../bench',
- '../experimental',
'../gm',
'../include/views',
'../include/private',
- '../samplecode',
'../src/core',
'../src/effects',
'../src/gpu',
- '../src/image',
'../src/images',
- '../src/pathops',
+ '../src/image',
'../src/views/unix',
'../tools/timer',
- '../tools',
],
'sources': [
'../gm/gm.cpp',
-
+ '../src/views/SkTouchGesture.cpp',
'../src/views/unix/keysym2ucs.c',
'<!@(python find.py ../tools/viewer "*.cpp")',
-
- # 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/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/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',
- '../src/views/SkTouchGesture.cpp',
-
- # 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', #relies on pthread.h
- ],
'dependencies': [
- 'experimental.gyp:experimental',
'flags.gyp:flags',
'gputest.gyp:skgputest',
'jsoncpp.gyp:jsoncpp',
- 'lua.gyp:lua',
- 'pdf.gyp:pdf',
'skia_lib.gyp:skia_lib',
'tools.gyp:crash_handler',
'tools.gyp:proc_stats',
@@ -159,8 +45,6 @@
'tools.gyp:sk_tool_utils',
'tools.gyp:timer',
'tools.gyp:url_data_manager',
- 'views.gyp:views',
- 'xml.gyp:xml',
],
'conditions' : [
[ 'skia_os == "android"', {