diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:40 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:40 +0000 |
| commit | 0527dc6e1625a25ebfd13de360fceccae2592065 (patch) | |
| tree | 5f3c41a14fac7ec5b674a451a8bb936582c70044 | |
| parent | c196bf58ea038d3efe1114cd95322dc4e9e83612 (diff) | |
| parent | 84d3ecef6063d2b878272c26ccc22f4c99811849 (diff) | |
| download | gyp-0527dc6e1625a25ebfd13de360fceccae2592065.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: Ia8871320e760a5cb135e0077e15d9f3387ca80e0
| -rw-r--r-- | FileReaderApp.gyp | 6 | ||||
| -rw-r--r-- | SampleApp.gyp | 8 | ||||
| -rw-r--r-- | SimpleCocoaApp.gyp | 6 | ||||
| -rw-r--r-- | SimpleiOSApp.gyp | 6 | ||||
| -rw-r--r-- | angle.gyp | 27 | ||||
| -rw-r--r-- | animator.gyp | 6 | ||||
| -rw-r--r-- | apptype_console.gypi | 6 | ||||
| -rw-r--r-- | bench.gyp | 89 | ||||
| -rw-r--r-- | bench.gypi | 88 | ||||
| -rw-r--r-- | cityhash.gyp | 5 | ||||
| -rw-r--r-- | common.gypi | 5 | ||||
| -rw-r--r-- | common_conditions.gypi | 8 | ||||
| -rw-r--r-- | common_variables.gypi | 7 | ||||
| -rw-r--r-- | core.gyp | 6 | ||||
| -rw-r--r-- | core.gypi | 26 | ||||
| -rw-r--r-- | debugger.gyp | 6 | ||||
| -rw-r--r-- | dm.gyp | 5 | ||||
| -rwxr-xr-x | edtaa.gyp | 7 | ||||
| -rw-r--r-- | effects.gyp | 6 | ||||
| -rw-r--r-- | effects.gypi | 6 | ||||
| -rw-r--r-- | everything.gyp | 7 | ||||
| -rw-r--r-- | experimental.gyp | 6 | ||||
| -rw-r--r-- | flags.gyp | 6 | ||||
| -rw-r--r-- | freetype.gyp | 6 | ||||
| -rw-r--r-- | gm.gyp | 8 | ||||
| -rw-r--r-- | gmslides.gypi | 10 | ||||
| -rw-r--r-- | gpu.gyp | 15 | ||||
| -rw-r--r-- | gpu.gypi | 12 | ||||
| -rw-r--r-- | gputest.gyp | 9 | ||||
| -rw-r--r-- | images.gyp | 9 | ||||
| -rw-r--r-- | jsoncpp.gyp | 6 | ||||
| -rw-r--r-- | libjpeg.gyp | 6 | ||||
| -rw-r--r-- | lua.gyp | 7 | ||||
| -rw-r--r-- | most.gyp | 6 | ||||
| -rw-r--r-- | opts.gyp | 11 | ||||
| -rw-r--r-- | pathops_unittest.gyp | 6 | ||||
| -rw-r--r-- | pdf.gyp | 6 | ||||
| -rw-r--r-- | pdf.gypi | 6 | ||||
| -rw-r--r-- | pdfviewer.gyp | 6 | ||||
| -rw-r--r-- | pdfviewer_lib.gyp | 8 | ||||
| -rw-r--r-- | pixman_test.gyp | 6 | ||||
| -rw-r--r-- | ports.gyp | 8 | ||||
| -rw-r--r-- | public_headers.gypi | 10 | ||||
| -rw-r--r-- | sfnt.gyp | 6 | ||||
| -rw-r--r-- | shapeops_demo.gyp | 6 | ||||
| -rw-r--r-- | shapeops_edge.gyp | 6 | ||||
| -rw-r--r-- | shapeops_tool.gyp | 6 | ||||
| -rw-r--r-- | skia_lib.gyp | 6 | ||||
| -rwxr-xr-x | skpskgr_test.gyp | 6 | ||||
| -rw-r--r-- | svg.gyp | 6 | ||||
| -rw-r--r-- | tests.gyp | 11 | ||||
| -rw-r--r-- | tools.gyp | 14 | ||||
| -rw-r--r-- | utils.gyp | 6 | ||||
| -rw-r--r-- | v8.gyp | 90 | ||||
| -rw-r--r-- | views.gyp | 6 | ||||
| -rw-r--r-- | views_animated.gyp | 6 | ||||
| -rw-r--r-- | xml.gyp | 6 | ||||
| -rw-r--r-- | xps.gyp | 10 | ||||
| -rw-r--r-- | zlib.gyp | 6 |
59 files changed, 242 insertions, 464 deletions
diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp index f590ffe..463688b 100644 --- a/FileReaderApp.gyp +++ b/FileReaderApp.gyp @@ -63,9 +63,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/SampleApp.gyp b/SampleApp.gyp index 2708036..16a5c30 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -12,6 +12,8 @@ 'include_dirs' : [ '../src/core', '../src/effects', #needed for BlurMask.h + '../src/images', + '../src/lazy', '../gm', # needed to pull gm.h '../samplecode', # To pull SampleApp.h and SampleCode.h '../src/pipe/utils', # For TiledPipeController @@ -322,9 +324,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/SimpleCocoaApp.gyp b/SimpleCocoaApp.gyp index 6d7b925..1500db4 100644 --- a/SimpleCocoaApp.gyp +++ b/SimpleCocoaApp.gyp @@ -52,9 +52,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/SimpleiOSApp.gyp b/SimpleiOSApp.gyp index cb00f81..a44c8d1 100644 --- a/SimpleiOSApp.gyp +++ b/SimpleiOSApp.gyp @@ -61,9 +61,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -4,9 +4,30 @@ 'conditions': [ [ 'skia_angle', { 'target_defaults': { + 'include_dirs': [ + '$(DXSDK_DIR)/Include', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'conditions': [ + [ 'skia_arch_width == 32 ', { + 'AdditionalLibraryDirectories': [ + '$(DXSDK_DIR)/Lib/x86', + ], + },{ + 'AdditionalLibraryDirectories': [ + '$(DXSDK_DIR)/Lib/x64', + ], + }], + ], + }, + }, 'defines': [ 'NOMINMAX', ], + 'defines/': [ + ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'], + ], }, 'variables': { 'component': 'static_library', @@ -33,9 +54,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/animator.gyp b/animator.gyp index f6d875c..06603ba 100644 --- a/animator.gyp +++ b/animator.gyp @@ -185,9 +185,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/apptype_console.gypi b/apptype_console.gypi index 9a5e8a7..b9c1ff6 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -75,9 +75,3 @@ ], }, } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -13,13 +13,90 @@ '../src/effects', '../src/utils', ], - 'includes': [ - 'bench.gypi' - ], 'dependencies': [ 'skia_lib.gyp:skia_lib', 'bench_timer', 'flags.gyp:flags', + 'jsoncpp.gyp:jsoncpp', + ], + 'sources': [ + '../bench/AAClipBench.cpp', + '../bench/BicubicBench.cpp', + '../bench/BitmapBench.cpp', + '../bench/BitmapRectBench.cpp', + '../bench/BitmapScaleBench.cpp', + '../bench/BlurBench.cpp', + '../bench/BlurImageFilterBench.cpp', + '../bench/BlurRectBench.cpp', + '../bench/BlurRoundRectBench.cpp', + '../bench/ChartBench.cpp', + '../bench/ChecksumBench.cpp', + '../bench/ChromeBench.cpp', + '../bench/CmapBench.cpp', + '../bench/ColorFilterBench.cpp', + '../bench/ColorPrivBench.cpp', + '../bench/CoverageBench.cpp', + '../bench/DashBench.cpp', + '../bench/DecodeBench.cpp', + '../bench/DeferredCanvasBench.cpp', + '../bench/DeferredSurfaceCopyBench.cpp', + '../bench/DisplacementBench.cpp', + '../bench/FSRectBench.cpp', + '../bench/FontCacheBench.cpp', + '../bench/FontScalerBench.cpp', + '../bench/GameBench.cpp', + '../bench/GrMemoryPoolBench.cpp', + '../bench/GrResourceCacheBench.cpp', + '../bench/GradientBench.cpp', + '../bench/HairlinePathBench.cpp', + '../bench/ImageCacheBench.cpp', + '../bench/ImageDecodeBench.cpp', + '../bench/InterpBench.cpp', + '../bench/LightingBench.cpp', + '../bench/LineBench.cpp', + '../bench/MagnifierBench.cpp', + '../bench/MathBench.cpp', + '../bench/Matrix44Bench.cpp', + '../bench/MatrixBench.cpp', + '../bench/MatrixConvolutionBench.cpp', + '../bench/MemoryBench.cpp', + '../bench/MemsetBench.cpp', + '../bench/MergeBench.cpp', + '../bench/MorphologyBench.cpp', + '../bench/MutexBench.cpp', + '../bench/PathBench.cpp', + '../bench/PathIterBench.cpp', + '../bench/PathUtilsBench.cpp', + '../bench/PerlinNoiseBench.cpp', + '../bench/PicturePlaybackBench.cpp', + '../bench/PictureRecordBench.cpp', + '../bench/PremulAndUnpremulAlphaOpsBench.cpp', + '../bench/RTreeBench.cpp', + '../bench/ReadPixBench.cpp', + '../bench/RectBench.cpp', + '../bench/RectoriBench.cpp', + '../bench/RefCntBench.cpp', + '../bench/RegionBench.cpp', + '../bench/RegionContainBench.cpp', + '../bench/RepeatTileBench.cpp', + '../bench/ScalarBench.cpp', + '../bench/ShaderMaskBench.cpp', + '../bench/SkipZeroesBench.cpp', + '../bench/SortBench.cpp', + '../bench/StrokeBench.cpp', + '../bench/TableBench.cpp', + '../bench/TextBench.cpp', + '../bench/TileBench.cpp', + '../bench/VertBench.cpp', + '../bench/WritePixelsBench.cpp', + '../bench/WriterBench.cpp', + '../bench/XfermodeBench.cpp', + + '../bench/SkBenchLogger.cpp', + '../bench/SkBenchLogger.h', + '../bench/SkBenchmark.cpp', + '../bench/SkBenchmark.h', + '../bench/benchmain.cpp', ], 'conditions': [ ['skia_gpu == 1', @@ -87,9 +164,3 @@ } ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/bench.gypi b/bench.gypi deleted file mode 100644 index 33f0dba..0000000 --- a/bench.gypi +++ /dev/null @@ -1,88 +0,0 @@ -# sources and conditions used in skia's bench.gyp and chromium's skia.gyp -# -{ - 'sources': [ - '../bench/benchmain.cpp', - '../bench/SkBenchmark.h', - '../bench/SkBenchmark.cpp', - '../bench/AAClipBench.cpp', - '../bench/BicubicBench.cpp', - '../bench/BitmapBench.cpp', - '../bench/BitmapRectBench.cpp', - '../bench/BitmapScaleBench.cpp', - '../bench/BlurBench.cpp', - '../bench/BlurImageFilterBench.cpp', - '../bench/BlurRectBench.cpp', - '../bench/BlurRoundRectBench.cpp', - '../bench/ChecksumBench.cpp', - '../bench/ChartBench.cpp', - '../bench/ChromeBench.cpp', - '../bench/CmapBench.cpp', - '../bench/ColorFilterBench.cpp', - '../bench/CoverageBench.cpp', - '../bench/DashBench.cpp', - '../bench/DecodeBench.cpp', - '../bench/DeferredCanvasBench.cpp', - '../bench/DeferredSurfaceCopyBench.cpp', - '../bench/DisplacementBench.cpp', - '../bench/FontCacheBench.cpp', - '../bench/FontScalerBench.cpp', - '../bench/FSRectBench.cpp', - '../bench/GameBench.cpp', - '../bench/GradientBench.cpp', - '../bench/GrMemoryPoolBench.cpp', - '../bench/GrResourceCacheBench.cpp', - '../bench/ImageCacheBench.cpp', - '../bench/ImageDecodeBench.cpp', - '../bench/InterpBench.cpp', - '../bench/HairlinePathBench.cpp', - '../bench/LineBench.cpp', - '../bench/LightingBench.cpp', - '../bench/MagnifierBench.cpp', - '../bench/MathBench.cpp', - '../bench/Matrix44Bench.cpp', - '../bench/MatrixBench.cpp', - '../bench/MatrixConvolutionBench.cpp', - '../bench/MemoryBench.cpp', - '../bench/MemsetBench.cpp', - '../bench/MergeBench.cpp', - '../bench/MorphologyBench.cpp', - '../bench/MutexBench.cpp', - '../bench/PathBench.cpp', - '../bench/PathIterBench.cpp', - '../bench/PathUtilsBench.cpp', - '../bench/PerlinNoiseBench.cpp', - '../bench/PicturePlaybackBench.cpp', - '../bench/PictureRecordBench.cpp', - '../bench/ReadPixBench.cpp', - '../bench/PremulAndUnpremulAlphaOpsBench.cpp', - '../bench/RectBench.cpp', - '../bench/RectoriBench.cpp', - '../bench/RefCntBench.cpp', - '../bench/RegionBench.cpp', - '../bench/RegionContainBench.cpp', - '../bench/RepeatTileBench.cpp', - '../bench/RTreeBench.cpp', - '../bench/ScalarBench.cpp', - '../bench/ShaderMaskBench.cpp', - '../bench/SkipZeroesBench.cpp', - '../bench/SortBench.cpp', - '../bench/StrokeBench.cpp', - '../bench/TableBench.cpp', - '../bench/TextBench.cpp', - '../bench/TileBench.cpp', - '../bench/VertBench.cpp', - '../bench/WriterBench.cpp', - '../bench/XfermodeBench.cpp', - '../bench/WritePixelsBench.cpp', - - '../bench/SkBenchLogger.h', - '../bench/SkBenchLogger.cpp', - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/cityhash.gyp b/cityhash.gyp deleted file mode 100644 index 461c8cc..0000000 --- a/cityhash.gyp +++ /dev/null @@ -1,5 +0,0 @@ -# Do-nothing gypfile, to keep the buildbots green. -# See https://code.google.com/p/skia/issues/detail?id=1286 -# ('removing cityhash.gyp broke SOME but not ALL buildbots') -{ -} diff --git a/common.gypi b/common.gypi index d55b7cc..48b9a6d 100644 --- a/common.gypi +++ b/common.gypi @@ -110,8 +110,3 @@ }, }, # end 'target_defaults' } -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/common_conditions.gypi b/common_conditions.gypi index d25f035..83bc561 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -5,7 +5,7 @@ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 'SK_SUPPORT_GPU=<(skia_gpu)', 'SK_SUPPORT_OPENCL=<(skia_opencl)', - 'SK_DISTANCEFIELD_FONTSC=<(skia_distancefield_fonts)', + 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', ], 'conditions' : [ [ 'skia_os == "win"', @@ -491,9 +491,3 @@ 'SYMROOT': '<(DEPTH)/xcodebuild', }, } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/common_variables.gypi b/common_variables.gypi index 425760e..74e596c 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -87,6 +87,7 @@ 'skia_resource_cache_mb_limit%': 0, 'skia_resource_cache_count_limit%': 0, 'skia_angle%': 0, + 'skia_chrome_utils%': 1, 'skia_directwrite%': 0, 'skia_gpu%': 1, 'skia_osx_sdkroot%': '', @@ -147,6 +148,7 @@ 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_type%': '<(skia_arch_type)', + 'skia_chrome_utils%': '<(skia_chrome_utils)', 'skia_directwrite%': '<(skia_directwrite)', 'skia_gpu%': '<(skia_gpu)', 'skia_win_exceptions%': 0, @@ -166,8 +168,3 @@ 'skia_include_path%': '../include', }, } -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -126,9 +126,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -14,7 +14,6 @@ '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', - '<(skia_src_path)/core/SkBBoxHierarchy.cpp', '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBBoxRecord.cpp', '<(skia_src_path)/core/SkBBoxRecord.h', @@ -44,7 +43,6 @@ '<(skia_src_path)/core/SkBlitRow_D32.cpp', '<(skia_src_path)/core/SkBlitter.h', '<(skia_src_path)/core/SkBlitter.cpp', - '<(skia_src_path)/core/SkBlitter_A1.cpp', '<(skia_src_path)/core/SkBlitter_A8.cpp', '<(skia_src_path)/core/SkBlitter_ARGB32.cpp', '<(skia_src_path)/core/SkBlitter_RGB16.cpp', @@ -73,6 +71,7 @@ '<(skia_src_path)/core/SkDevice.cpp', '<(skia_src_path)/core/SkDeviceLooper.cpp', '<(skia_src_path)/core/SkDeviceProfile.cpp', + '<(skia_src_path)/lazy/SkDiscardableMemoryPool.cpp', '<(skia_src_path)/lazy/SkDiscardablePixelRef.cpp', '<(skia_src_path)/core/SkDither.cpp', '<(skia_src_path)/core/SkDraw.cpp', @@ -107,6 +106,7 @@ '<(skia_src_path)/core/SkInstCnt.cpp', '<(skia_src_path)/core/SkImageFilter.cpp', '<(skia_src_path)/core/SkImageFilterUtils.cpp', + '<(skia_src_path)/core/SkImageInfo.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', @@ -150,7 +150,6 @@ '<(skia_src_path)/core/SkRasterClip.cpp', '<(skia_src_path)/core/SkRasterizer.cpp', '<(skia_src_path)/core/SkRect.cpp', - '<(skia_src_path)/core/SkRefCnt.cpp', '<(skia_src_path)/core/SkRefDict.cpp', '<(skia_src_path)/core/SkRegion.cpp', '<(skia_src_path)/core/SkRegionPriv.h', @@ -310,23 +309,8 @@ '<(skia_include_path)/core/SkXfermode.h', # Lazy decoding: - '<(skia_include_path)/lazy/SkBitmapFactory.h', - '<(skia_include_path)/lazy/SkImageCache.h', - '<(skia_include_path)/lazy/SkLruImageCache.h', - '<(skia_include_path)/lazy/SkPurgeableImageCache.h', - - '<(skia_src_path)/lazy/SkBitmapFactory.cpp', - '<(skia_src_path)/lazy/SkLazyPixelRef.h', - '<(skia_src_path)/lazy/SkLazyPixelRef.cpp', - '<(skia_src_path)/lazy/SkLruImageCache.cpp', - '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h', - '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp', - '<(skia_src_path)/lazy/SkPurgeableImageCache.cpp', - '<(skia_src_path)/lazy/SkCachingPixelRef.cpp', '<(skia_src_path)/lazy/SkCachingPixelRef.h', - '<(skia_src_path)/lazy/SkLazyCachingPixelRef.cpp', - '<(skia_src_path)/lazy/SkLazyCachingPixelRef.h', # Path ops '<(skia_include_path)/pathops/SkPathOps.h', @@ -385,9 +369,3 @@ '<(skia_src_path)/pathops/SkReduceOrder.h', ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/debugger.gyp b/debugger.gyp index 3a972c2..8c85736 100644 --- a/debugger.gyp +++ b/debugger.gyp @@ -186,9 +186,3 @@ }], ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -9,6 +9,8 @@ 'include_dirs': [ '../dm', '../gm', + '../src/images', + '../src/lazy', '../src/core', '../src/effects', '../src/pipe/utils/', @@ -18,8 +20,8 @@ 'includes': [ 'gmslides.gypi' ], 'sources': [ '../dm/DM.cpp', - '../dm/DMComparisonTask.cpp', '../dm/DMCpuTask.cpp', + '../dm/DMExpectationsTask.cpp', '../dm/DMGpuTask.cpp', '../dm/DMPipeTask.cpp', '../dm/DMReplayTask.cpp', @@ -27,6 +29,7 @@ '../dm/DMSerializeTask.cpp', '../dm/DMTask.cpp', '../dm/DMTaskRunner.cpp', + '../dm/DMTileGridTask.cpp', '../dm/DMUtil.cpp', '../dm/DMWriteTask.cpp', '../gm/gm.cpp', @@ -5,7 +5,6 @@ # found in the LICENSE file. # - { 'targets': [ { @@ -30,9 +29,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/effects.gyp b/effects.gyp index 7b256d3..63b8636 100644 --- a/effects.gyp +++ b/effects.gyp @@ -39,9 +39,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/effects.gypi b/effects.gypi index 32747ae..845dd94 100644 --- a/effects.gypi +++ b/effects.gypi @@ -119,9 +119,3 @@ '<(skia_include_path)/effects/SkMagnifierImageFilter.h', ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/everything.gyp b/everything.gyp index 9bd825e..5d1697e 100644 --- a/everything.gyp +++ b/everything.gyp @@ -22,6 +22,7 @@ 'dependencies': [ 'debugger.gyp:debugger', 'pdfviewer.gyp:pdfviewer', + #'v8.gyp:SkV8Example', ], }], # DM assumes you've got a GPU. @@ -32,9 +33,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/experimental.gyp b/experimental.gyp index 76bf071..a0daf3d 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -90,9 +90,3 @@ } ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -20,9 +20,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/freetype.gyp b/freetype.gyp index 30afb06..41f3b57 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -102,9 +102,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -29,6 +29,8 @@ 'type': 'executable', 'include_dirs' : [ '../src/core', + '../src/images', + '../src/lazy', '../src/effects', '../src/pipe/utils/', '../src/utils/', @@ -113,9 +115,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gmslides.gypi b/gmslides.gypi index 542de0f..e29a702 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,8 @@ '../gm/bitmaprect.cpp', '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', + '../gm/bitmapshader.cpp', + '../gm/bitmapsource.cpp', '../gm/bleed.cpp', '../gm/blurs.cpp', '../gm/blurquickreject.cpp', @@ -50,6 +52,7 @@ '../gm/downsamplebitmap.cpp', '../gm/drawbitmaprect.cpp', '../gm/drawlooper.cpp', + '../gm/dropshadowimagefilter.cpp', '../gm/extractbitmap.cpp', '../gm/emptypath.cpp', '../gm/fatpathfill.cpp', @@ -104,6 +107,7 @@ '../gm/perlinnoise.cpp', '../gm/points.cpp', '../gm/poly2poly.cpp', + '../gm/polygons.cpp', '../gm/quadpaths.cpp', '../gm/rects.cpp', '../gm/rrect.cpp', @@ -148,9 +152,3 @@ '../gm/xfermodes3.cpp', ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -133,6 +133,15 @@ 'GR_ANDROID_PATH_RENDERING=1', ], }], + [ 'skia_chrome_utils', { + 'sources': [ + '../experimental/ChromeUtils/SkBorder.cpp', + '../experimental/ChromeUtils/SkBorder.h', + ], + 'defines': [ + 'GR_CHROME_UTILS=1', + ], + }], [ 'skia_distancefield_fonts', { 'sources': [ '<(skia_include_path)/gpu/GrDistanceFieldTextContext.h', @@ -231,9 +240,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -70,7 +70,6 @@ '<(skia_src_path)/gpu/GrDrawTarget.h', '<(skia_src_path)/gpu/GrDrawTargetCaps.h', '<(skia_src_path)/gpu/GrEffect.cpp', - '<(skia_src_path)/gpu/GrGeometryBuffer.cpp', '<(skia_src_path)/gpu/GrGeometryBuffer.h', '<(skia_src_path)/gpu/GrClipMaskCache.h', '<(skia_src_path)/gpu/GrClipMaskCache.cpp', @@ -126,7 +125,6 @@ '<(skia_src_path)/gpu/GrTextureAccess.cpp', '<(skia_src_path)/gpu/GrTHashTable.h', '<(skia_src_path)/gpu/GrVertexBuffer.h', - '<(skia_src_path)/gpu/gr_unittests.cpp', '<(skia_src_path)/gpu/effects/Gr1DKernelEffect.h', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.cpp', @@ -143,8 +141,8 @@ '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', - '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', - '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', + '<(skia_src_path)/gpu/effects/GrTextureDomain.cpp', + '<(skia_src_path)/gpu/effects/GrTextureDomain.h', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', @@ -283,9 +281,3 @@ ], }, } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gputest.gyp b/gputest.gyp index c673f20..da7722d 100644 --- a/gputest.gyp +++ b/gputest.gyp @@ -23,15 +23,6 @@ '<(skia_src_path)/gpu/GrTest.cpp', '<(skia_src_path)/gpu/GrTest.h', ], - 'defines': [ - 'GR_IMPLEMENTATION=1', - ], }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -38,6 +38,7 @@ '../src/images/bmpdecoderhelper.h', '../src/images/SkDecodingImageGenerator.cpp', + '../src/images/SkDecodingImageGenerator.h', '../src/images/SkForceLinking.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', @@ -84,7 +85,7 @@ ], 'link_settings': { 'libraries': [ - 'windowscodecs.lib', + '-lwindowscodecs.lib', ], }, },{ #else if skia_os != win @@ -174,9 +175,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/jsoncpp.gyp b/jsoncpp.gyp index 390f8f9..1b5b784 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -55,9 +55,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/libjpeg.gyp b/libjpeg.gyp index 975831b..88ba298 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -133,9 +133,3 @@ }], ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -5,7 +5,6 @@ # found in the LICENSE file. # - { 'targets': [ { @@ -63,9 +62,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -29,9 +29,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -79,7 +79,6 @@ '../src/opts/SkBlitMask_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.h', - '../src/opts/SkBlurImage_opts_none.cpp', '../src/opts/SkXfermode_opts_arm.cpp', ], 'conditions': [ @@ -98,7 +97,7 @@ }], ], }], - [ '(skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { + [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', @@ -177,16 +176,12 @@ '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', + '../src/opts/SkBlitMask_opts_arm_neon.cpp', '../src/opts/SkBlitRow_opts_arm_neon.cpp', + '../src/opts/SkBlurImage_opts_neon.cpp', '../src/opts/SkMorphology_opts_neon.cpp', '../src/opts/SkXfermode_opts_arm_neon.cpp', ], }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index ea4e5b8..49af7d7 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -41,9 +41,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -36,9 +36,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -40,9 +40,3 @@ '<(skia_src_path)/pdf/SkTSet.h', ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 7635877..b21afe5 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -44,9 +44,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pdfviewer_lib.gyp b/pdfviewer_lib.gyp index 37b1285..a0a142c 100644 --- a/pdfviewer_lib.gyp +++ b/pdfviewer_lib.gyp @@ -12,12 +12,14 @@ # FIXME: Include directory is named "inc" (instead of "include") in # order to not be considered the public API. '../experimental/PdfViewer/inc/SkPdfContext.h', + '../experimental/PdfViewer/inc/SkPdfDiffEncoder.h', '../experimental/PdfViewer/inc/SkPdfRenderer.h', '../experimental/PdfViewer/inc/SkPdfTokenLooper.h', '../experimental/PdfViewer/src/SkPdfContext.cpp', '../experimental/PdfViewer/src/SkPdfRenderer.cpp', '../experimental/PdfViewer/src/SkTDStackNester.h', + '../experimental/PdfViewer/src/SkPdfDiffEncoder.cpp', '../experimental/PdfViewer/SkPdfGraphicsState.cpp', '../experimental/PdfViewer/SkPdfFont.cpp', @@ -47,9 +49,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/pixman_test.gyp b/pixman_test.gyp index 3a39b90..f5e5a82 100644 --- a/pixman_test.gyp +++ b/pixman_test.gyp @@ -167,9 +167,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -153,10 +153,12 @@ [ 'skia_os == "android"', { 'sources!': [ '../src/ports/SkDebug_stdio.cpp', + '../src/ports/SkDiscardableMemory_none.cpp', '../src/ports/SkPurgeableMemoryBlock_none.cpp', ], 'sources': [ '../src/ports/SkDebug_android.cpp', + '../src/ports/SkDiscardableMemory_ashmem.cpp', '../src/ports/SkFontConfigInterface_android.cpp', '../src/ports/SkFontConfigParser_android.cpp', '../src/ports/SkFontHost_fontconfig.cpp', @@ -175,9 +177,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/public_headers.gypi b/public_headers.gypi index d563d84..45114e8 100644 --- a/public_headers.gypi +++ b/public_headers.gypi @@ -297,16 +297,6 @@ 'views/SkOSWindow_Unix.h', 'views/SkWidget.h', 'views/SkOSWindow_Win.h', - 'lazy/SkBitmapFactory.h', - 'lazy/SkImageCache.h', - 'lazy/SkPurgeableImageCache.h', - 'lazy/SkLruImageCache.h', ], }, } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -48,9 +48,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/shapeops_demo.gyp b/shapeops_demo.gyp index ff5c3da..ce46a79 100644 --- a/shapeops_demo.gyp +++ b/shapeops_demo.gyp @@ -116,9 +116,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/shapeops_edge.gyp b/shapeops_edge.gyp index e4e7d72..bbe198c 100644 --- a/shapeops_edge.gyp +++ b/shapeops_edge.gyp @@ -127,9 +127,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/shapeops_tool.gyp b/shapeops_tool.gyp index 35caccb..c5605fe 100644 --- a/shapeops_tool.gyp +++ b/shapeops_tool.gyp @@ -29,9 +29,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/skia_lib.gyp b/skia_lib.gyp index 6f8e9cf..5f3f141 100644 --- a/skia_lib.gyp +++ b/skia_lib.gyp @@ -58,9 +58,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/skpskgr_test.gyp b/skpskgr_test.gyp index 3a5e4d1..5af0bfb 100755 --- a/skpskgr_test.gyp +++ b/skpskgr_test.gyp @@ -38,9 +38,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -82,9 +82,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -33,7 +33,6 @@ '../tests/ARGBImageEncoderTest.cpp', '../tests/AtomicTest.cpp', '../tests/BitmapCopyTest.cpp', - '../tests/BitmapFactoryTest.cpp', '../tests/BitmapGetColorTest.cpp', '../tests/BitmapHasherTest.cpp', '../tests/BitmapHeapTest.cpp', @@ -50,11 +49,14 @@ '../tests/ClipStackTest.cpp', '../tests/ClipperTest.cpp', '../tests/ColorFilterTest.cpp', + '../tests/ColorPrivTest.cpp', '../tests/ColorTest.cpp', '../tests/DataRefTest.cpp', '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', '../tests/DeviceLooperTest.cpp', + '../tests/DiscardableMemoryPool.cpp', + '../tests/DiscardableMemoryTest.cpp', '../tests/DocumentTest.cpp', '../tests/DrawBitmapRectTest.cpp', '../tests/DrawPathTest.cpp', @@ -83,6 +85,7 @@ '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', '../tests/GrSurfaceTest.cpp', + '../tests/GrUnitTests.cpp', '../tests/HashCacheTest.cpp', '../tests/ImageCacheTest.cpp', '../tests/ImageDecodingTest.cpp', @@ -180,9 +183,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -211,6 +211,9 @@ '../tools/render_pictures_main.cpp', ], 'include_dirs': [ + '../src/core', + '../src/images', + '../src/lazy', '../src/pipe/utils/', ], 'dependencies': [ @@ -232,6 +235,7 @@ '../tools/PictureBenchmark.cpp', ], 'include_dirs': [ + '../src/core/', '../bench', '../src/lazy/', ], @@ -258,7 +262,9 @@ '../src/pipe/utils/SamplePipeControllers.cpp', ], 'include_dirs': [ - '../src/core/', + '../src/core', + '../src/images', + '../src/lazy', '../src/pipe/utils/', '../src/utils/', ], @@ -481,9 +487,3 @@ ], ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -228,9 +228,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -0,0 +1,90 @@ +# GYP file to build a V8 sample. +{ + 'targets': [ + { + 'target_name': 'SkV8Example', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../tools/flags', + '../../../v8/include', + ], + 'includes': [], + 'sources': [ + '../experimental/SkV8Example/SkV8Example.h', + '../experimental/SkV8Example/SkV8Example.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'views.gyp:views', + 'xml.gyp:xml', + ], + + 'link_settings': { + 'libraries': [ + +# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib', +# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib', + +# 'd:/src/v8/build/Debug/lib/icuuc.lib', +# 'd:/src/v8/build/Debug/lib/icui18n.lib', + +# 'Ws2_32.lib', +# 'Winmm.lib', + + '-lpthread', + '-lrt', + '../../../v8/out/native/obj.target/tools/gyp/libv8_base.x64.a', + '../../../v8/out/native/obj.target/tools/gyp/libv8_snapshot.a', + + '../../../v8/out/native/obj.target/third_party/icu/libicudata.a', + '../../../v8/out/native/obj.target/third_party/icu/libicui18n.a', + '../../../v8/out/native/obj.target/third_party/icu/libicuuc.a', + + '../../../v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o', + ], + }, + 'conditions' : [ + [ 'skia_gpu == 1', { + 'include_dirs' : [ + '../src/gpu', #gl/GrGLUtil.h + ] + }], + [ 'skia_os == "win"', { + 'sources' : [ + '../src/views/win/SkOSWindow_Win.cpp', + '../src/views/win/skia_win.cpp', + ], + }, + ], + + [ 'skia_os == "mac"', { + 'sources': [ + + '../src/views/mac/SampleAppDelegate.h', + '../src/views/mac/SampleAppDelegate.mm', + '../src/views/mac/SkEventNotifier.mm', + '../src/views/mac/skia_mac.mm', + '../src/views/mac/SkNSView.h', + '../src/views/mac/SkNSView.mm', + '../src/views/mac/SkOptionsTableView.h', + '../src/views/mac/SkOptionsTableView.mm', + '../src/views/mac/SkOSWindow_Mac.mm', + '../src/views/mac/SkTextFieldCell.h', + '../src/views/mac/SkTextFieldCell.m', + ], + 'include_dirs' : [ + '../src/views/mac/' + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SkiaExamples/SkiaExamples.xib' + ], + } + ], + ], + } + ], +} @@ -140,9 +140,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/views_animated.gyp b/views_animated.gyp index 4bfcb28..01ec4fa 100644 --- a/views_animated.gyp +++ b/views_animated.gyp @@ -63,9 +63,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -49,9 +49,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -25,8 +25,8 @@ [ 'skia_os == "win"', { 'link_settings': { 'libraries': [ - 'T2Embed.lib', - 'FontSub.lib', + '-lt2embed.lib', + '-lfontsub.lib', ], }, },{ #else if 'skia_os != "win"' @@ -58,9 +58,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: @@ -36,9 +36,3 @@ }, ], } - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: |