diff options
| -rw-r--r-- | SampleApp.gyp | 14 | ||||
| -rw-r--r-- | apptype_console.gypi | 1 | ||||
| -rw-r--r-- | bench.gypi | 7 | ||||
| -rw-r--r-- | common.gypi | 3 | ||||
| -rw-r--r-- | common_conditions.gypi | 120 | ||||
| -rw-r--r-- | common_variables.gypi | 19 | ||||
| -rw-r--r-- | core.gyp | 4 | ||||
| -rw-r--r-- | core.gypi | 22 | ||||
| -rw-r--r-- | dm.gyp | 47 | ||||
| -rwxr-xr-x | edtaa.gyp | 38 | ||||
| -rw-r--r-- | effects.gyp | 2 | ||||
| -rw-r--r-- | effects.gypi | 6 | ||||
| -rw-r--r-- | everything.gyp | 15 | ||||
| -rw-r--r-- | experimental.gyp | 1 | ||||
| -rw-r--r-- | fontconfig.gyp | 100 | ||||
| -rw-r--r-- | freetype.gyp | 82 | ||||
| -rw-r--r-- | freetype.gypi | 64 | ||||
| -rw-r--r-- | gm.gyp | 25 | ||||
| -rw-r--r-- | gmslides.gypi | 22 | ||||
| -rw-r--r-- | gpu.gyp | 70 | ||||
| -rw-r--r-- | gpu.gypi | 27 | ||||
| -rw-r--r-- | gputest.gyp | 37 | ||||
| -rw-r--r-- | iconv.gyp | 43 | ||||
| -rw-r--r-- | images.gyp | 6 | ||||
| -rw-r--r-- | jsoncpp.gyp | 8 | ||||
| -rw-r--r-- | libwebp.gyp | 1 | ||||
| -rw-r--r-- | most.gyp | 3 | ||||
| -rw-r--r-- | opts.gyp | 12 | ||||
| -rw-r--r-- | pathops.gypi | 1 | ||||
| -rw-r--r-- | pathops_unittest.gyp | 1 | ||||
| -rw-r--r-- | pathops_unittest.gypi | 1 | ||||
| -rw-r--r-- | pdf.gyp | 3 | ||||
| -rw-r--r-- | pdf.gypi | 6 | ||||
| -rw-r--r-- | pdfviewer.gyp | 85 | ||||
| -rw-r--r-- | pdfviewer_lib.gyp | 55 | ||||
| -rw-r--r-- | poppler.gyp | 235 | ||||
| -rw-r--r-- | ports.gyp | 30 | ||||
| -rw-r--r-- | public_headers.gypi | 312 | ||||
| -rwxr-xr-x | skpskgr_test.gyp | 46 | ||||
| -rw-r--r-- | tests.gyp | 38 | ||||
| -rw-r--r-- | tools.gyp | 14 | ||||
| -rw-r--r-- | utils.gyp | 11 |
42 files changed, 1333 insertions, 304 deletions
diff --git a/SampleApp.gyp b/SampleApp.gyp index 4fb8a84..2708036 100644 --- a/SampleApp.gyp +++ b/SampleApp.gyp @@ -1,6 +1,7 @@ +# { 'variables': { - #manaully set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp + #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp 'sample_pdf_file_viewer%': 0, }, 'targets': [ @@ -51,6 +52,7 @@ '../samplecode/SampleCamera.cpp', '../samplecode/SampleChart.cpp', '../samplecode/SampleCircle.cpp', + '../samplecode/SampleClock.cpp', '../samplecode/SampleClip.cpp', '../samplecode/SampleCode.h', '../samplecode/SampleColorFilter.cpp', @@ -68,6 +70,7 @@ '../samplecode/SampleFillType.cpp', '../samplecode/SampleFilter.cpp', '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFilterFuzz.cpp', '../samplecode/SampleFontCache.cpp', '../samplecode/SampleFontScalerTest.cpp', '../samplecode/SampleFuzz.cpp', @@ -102,6 +105,7 @@ '../samplecode/SampleShaderText.cpp', '../samplecode/SampleSkLayer.cpp', '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStringArt.cpp', '../samplecode/SampleStrokePath.cpp', '../samplecode/SampleTests.cpp', '../samplecode/SampleText.cpp', @@ -161,10 +165,10 @@ 'SAMPLE_PDF_FILE_VIEWER', ], 'dependencies': [ - 'pdfviewer.gyp:libpdfviewer', + 'pdfviewer_lib.gyp:pdfviewer_lib', ], 'include_dirs' : [ - '../experimental/PdfViewer/', + '../experimental/PdfViewer/inc', ], 'sources': [ '../samplecode/SamplePdfFileViewer.cpp', @@ -300,8 +304,8 @@ ], }], [ 'skia_gpu == 1', { - 'include_dirs': [ - '../src/gpu', # To pull gl/GrGLUtil.h + 'dependencies': [ + 'gputest.gyp:skgputest', ], }], [ 'skia_os == "nacl"', { diff --git a/apptype_console.gypi b/apptype_console.gypi index a306193..9a5e8a7 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -15,6 +15,7 @@ [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', + 'android_system.gyp:skia_launcher', ], }], [ 'skia_os == "nacl"', { @@ -13,11 +13,13 @@ '../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', @@ -29,6 +31,7 @@ '../bench/GameBench.cpp', '../bench/GradientBench.cpp', '../bench/GrMemoryPoolBench.cpp', + '../bench/GrResourceCacheBench.cpp', '../bench/ImageCacheBench.cpp', '../bench/ImageDecodeBench.cpp', '../bench/InterpBench.cpp', @@ -62,6 +65,7 @@ '../bench/RTreeBench.cpp', '../bench/ScalarBench.cpp', '../bench/ShaderMaskBench.cpp', + '../bench/SkipZeroesBench.cpp', '../bench/SortBench.cpp', '../bench/StrokeBench.cpp', '../bench/TableBench.cpp', @@ -70,11 +74,10 @@ '../bench/VertBench.cpp', '../bench/WriterBench.cpp', '../bench/XfermodeBench.cpp', + '../bench/WritePixelsBench.cpp', '../bench/SkBenchLogger.h', '../bench/SkBenchLogger.cpp', - '../bench/TimerData.h', - '../bench/TimerData.cpp', ], } diff --git a/common.gypi b/common.gypi index 2173d90..d55b7cc 100644 --- a/common.gypi +++ b/common.gypi @@ -14,6 +14,7 @@ 'defines': [ 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', + 'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar ], # Validate the 'skia_os' setting against 'OS', because only certain @@ -92,14 +93,12 @@ 'Debug': { 'defines': [ 'SK_DEBUG', - 'GR_DEBUG=1', 'SK_DEVELOPER=1', ], }, 'Release': { 'defines': [ 'SK_RELEASE', - 'GR_RELEASE=1', ], }, 'Release_Developer': { diff --git a/common_conditions.gypi b/common_conditions.gypi index e046b13..d25f035 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -3,37 +3,15 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', -# 'SK_SUPPORT_HINTING_SCALE_FACTOR', + 'SK_SUPPORT_GPU=<(skia_gpu)', + 'SK_SUPPORT_OPENCL=<(skia_opencl)', + 'SK_DISTANCEFIELD_FONTSC=<(skia_distancefield_fonts)', ], 'conditions' : [ - [ 'skia_gpu == 1', - { - 'defines': [ - 'SK_SUPPORT_GPU=1', - ], - }, { - 'defines': [ - 'SK_SUPPORT_GPU=0', - ], - }, - ], - [ 'skia_opencl == 1', - { - 'defines': [ - 'SK_SUPPORT_OPENCL=1', - ], - }, { - 'defines': [ - 'SK_SUPPORT_OPENCL=0', - ], - }, - ], [ 'skia_os == "win"', { 'defines': [ 'SK_BUILD_FOR_WIN32', - 'SK_FONTHOST_USES_FONTMGR', - 'SK_IGNORE_STDINT_DOT_H', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', ], @@ -141,6 +119,23 @@ # The following section is common to linux + derivatives and android [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { + 'cflags': [ + '-g', + '-fno-exceptions', + '-fstrict-aliasing', + + '-Wall', + '-Wextra', + '-Winit-self', + '-Wpointer-arith', + + '-Wno-unused-parameter', + '-Wno-c++11-extensions', + ], + 'cflags_cc': [ + '-fno-rtti', + '-Wnon-virtual-dtor', + ], 'conditions': [ [ 'skia_warnings_as_errors', { 'cflags': [ @@ -206,32 +201,25 @@ 'SK_BUILD_FOR_UNIX', ], 'configurations': { + 'Coverage': { + 'cflags': ['--coverage'], + 'ldflags': ['--coverage'], + }, 'Debug': { - 'cflags': ['-g'] }, 'Release': { 'cflags': [ '-O<(skia_release_optimization_level)', - '-g', ], 'defines': [ 'NDEBUG' ], }, }, - 'cflags': [ - '-Wall', - '-Wextra', - # suppressions below here were added for clang - '-Wno-unused-parameter', - '-Wno-c++11-extensions' - ], 'conditions' : [ [ 'skia_shared_lib', { 'cflags': [ '-fPIC', ], 'defines': [ - 'GR_DLL=1', - 'GR_IMPLEMENTATION=1', 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', ], @@ -248,13 +236,15 @@ '-pthread', ], }, + }, { # skia_os != "nacl" + 'link_settings': { + 'ldflags': [ + '-lstdc++', + '-lm', + ], + }, }], - [ 'skia_os == "chromeos"', { - 'ldflags': [ - '-lstdc++', - '-lm', - ], - }, { + [ 'skia_os != "chromeos"', { 'conditions': [ [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 'cflags': [ @@ -274,15 +264,36 @@ }], ], }], - [ 'skia_asan_build', { + # Enable asan, tsan, etc. + [ 'skia_sanitizer', { 'cflags': [ - '-fsanitize=address', - '-fno-omit-frame-pointer', + '-fsanitize=<(skia_sanitizer)', ], 'ldflags': [ - '-fsanitize=address', + '-fsanitize=<(skia_sanitizer)', + ], + 'conditions' : [ + [ 'skia_sanitizer == "thread"', { + 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], + 'cflags': [ '-fPIC' ], + 'target_conditions': [ + [ '_type == "executable"', { + 'cflags': [ '-fPIE' ], + 'ldflags': [ '-pie' ], + }], + ], + }], ], }], + [ 'skia_clang_build', { + 'cflags': [ + # Extra warnings we like but that only Clang knows about. + '-Wstring-conversion', + ], + }], + [ 'skia_keep_frame_pointer', { + 'cflags': [ '-fno-omit-frame-pointer' ], + }], ], }, ], @@ -294,7 +305,6 @@ }, 'defines': [ 'SK_BUILD_FOR_MAC', - 'SK_FONTHOST_USES_FONTMGR', ], 'conditions' : [ [ 'skia_arch_width == 64', { @@ -327,6 +337,13 @@ }], ], 'configurations': { + 'Coverage': { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '0', + 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', + 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS' : 'YES', + }, + }, 'Debug': { 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0', @@ -425,6 +442,7 @@ { 'defines': [ 'SK_BUILD_FOR_ANDROID', + 'SK_FONTHOST_DOES_NOT_USE_FONTMGR', ], 'configurations': { 'Debug': { @@ -441,22 +459,14 @@ '-llog', ], 'cflags': [ - '-Wall', - '-fno-exceptions', - '-fstrict-aliasing', '-fuse-ld=gold', ], - 'cflags_cc': [ - '-fno-rtti', - ], 'conditions': [ [ 'skia_shared_lib', { 'cflags': [ '-fPIC', ], 'defines': [ - 'GR_DLL=1', - 'GR_IMPLEMENTATION=1', 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', ], diff --git a/common_variables.gypi b/common_variables.gypi index 8965c82..425760e 100644 --- a/common_variables.gypi +++ b/common_variables.gypi @@ -78,12 +78,14 @@ }], ], + 'skia_sanitizer%': '', 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, 'skia_stroke_path_rendering%': 0, 'skia_android_path_rendering%': 0, - 'skia_texture_cache_mb_limit%': 0, + 'skia_resource_cache_mb_limit%': 0, + 'skia_resource_cache_count_limit%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, 'skia_gpu%': 1, @@ -92,6 +94,7 @@ 'skia_win_debuggers_path%': '', 'skia_shared_lib%': 0, 'skia_opencl%': 0, + 'skia_distancefield_fonts%': 0, # These variables determine the default optimization level for different # compilers. @@ -117,6 +120,13 @@ }, { 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)', }], + [ 'skia_sanitizer', { + 'skia_clang_build': 1, + 'skia_keep_frame_pointer': 1, + }, { + 'skia_clang_build%': 0, + 'skia_keep_frame_pointer%': 0, + }], ], # Re-define all variables defined within the level-2 'variables' dict, @@ -126,12 +136,14 @@ 'arm_neon_optional%': 0, 'skia_os%': '<(skia_os)', 'os_posix%': '<(os_posix)', + 'skia_sanitizer%': '<(skia_sanitizer)', 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 'skia_android_path_rendering%': '<(skia_android_path_rendering)', - 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', + 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)', + 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_type%': '<(skia_arch_type)', @@ -142,10 +154,11 @@ 'skia_profile_enabled%': '<(skia_profile_enabled)', 'skia_shared_lib%': '<(skia_shared_lib)', 'skia_opencl%': '<(skia_opencl)', + 'skia_distancefield_fonts%': '<(skia_distancefield_fonts)', 'skia_static_initializers%': '<(skia_static_initializers)', 'ios_sdk_version%': '6.0', 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', - 'skia_asan_build%': 0, + 'skia_run_pdfviewer_in_gm%': 0, # These are referenced by our .gypi files that list files (e.g. core.gypi) # @@ -22,6 +22,7 @@ '../include/utils', '../include/xml', '../src/core', + '../src/opts', '../src/image', ], 'sources': [ @@ -76,9 +77,6 @@ ], }], [ 'skia_os == "android"', { - 'sources': [ - '../src/core/SkPaintOptionsAndroid.cpp', - ], 'dependencies': [ 'android_deps.gyp:cpu_features', ], @@ -21,6 +21,7 @@ '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp', '<(skia_src_path)/core/SkBBoxHierarchyRecord.h', '<(skia_src_path)/core/SkBitmap.cpp', + '<(skia_src_path)/core/SkBitmapDevice.cpp', '<(skia_src_path)/core/SkBitmapFilter.h', '<(skia_src_path)/core/SkBitmapFilter.cpp', '<(skia_src_path)/core/SkBitmapHeap.cpp', @@ -70,7 +71,9 @@ '<(skia_src_path)/core/SkDebug.cpp', '<(skia_src_path)/core/SkDeque.cpp', '<(skia_src_path)/core/SkDevice.cpp', + '<(skia_src_path)/core/SkDeviceLooper.cpp', '<(skia_src_path)/core/SkDeviceProfile.cpp', + '<(skia_src_path)/lazy/SkDiscardablePixelRef.cpp', '<(skia_src_path)/core/SkDither.cpp', '<(skia_src_path)/core/SkDraw.cpp', '<(skia_src_path)/core/SkDrawLooper.cpp', @@ -87,6 +90,7 @@ '<(skia_src_path)/core/SkFilterShader.cpp', '<(skia_src_path)/core/SkFlattenable.cpp', '<(skia_src_path)/core/SkFlattenableBuffers.cpp', + '<(skia_src_path)/core/SkFlattenableSerialization.cpp', '<(skia_src_path)/core/SkFloat.cpp', '<(skia_src_path)/core/SkFloat.h', '<(skia_src_path)/core/SkFloatBits.cpp', @@ -98,6 +102,7 @@ '<(skia_src_path)/core/SkGeometry.cpp', '<(skia_src_path)/core/SkGlyphCache.cpp', '<(skia_src_path)/core/SkGlyphCache.h', + '<(skia_src_path)/core/SkGlyphCache_Globals.h', '<(skia_src_path)/core/SkGraphics.cpp', '<(skia_src_path)/core/SkInstCnt.cpp', '<(skia_src_path)/core/SkImageFilter.cpp', @@ -110,12 +115,15 @@ '<(skia_src_path)/core/SkMaskGamma.h', '<(skia_src_path)/core/SkMath.cpp', '<(skia_src_path)/core/SkMatrix.cpp', + '<(skia_src_path)/core/SkMessageBus.h', '<(skia_src_path)/core/SkMetaData.cpp', '<(skia_src_path)/core/SkMipMap.cpp', + '<(skia_src_path)/core/SkOnce.h', '<(skia_src_path)/core/SkOrderedReadBuffer.cpp', '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp', '<(skia_src_path)/core/SkPackBits.cpp', '<(skia_src_path)/core/SkPaint.cpp', + '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp', '<(skia_src_path)/core/SkPaintPriv.cpp', '<(skia_src_path)/core/SkPaintPriv.h', '<(skia_src_path)/core/SkPath.cpp', @@ -123,7 +131,7 @@ '<(skia_src_path)/core/SkPathHeap.cpp', '<(skia_src_path)/core/SkPathHeap.h', '<(skia_src_path)/core/SkPathMeasure.cpp', - '<(skia_src_path)/core/SkPathRef.h', + '<(skia_src_path)/core/SkPathRef.cpp', '<(skia_src_path)/core/SkPicture.cpp', '<(skia_src_path)/core/SkPictureFlat.cpp', '<(skia_src_path)/core/SkPictureFlat.h', @@ -189,6 +197,7 @@ '<(skia_src_path)/core/SkTypefaceCache.h', '<(skia_src_path)/core/SkUnPreMultiply.cpp', '<(skia_src_path)/core/SkUtils.cpp', + '<(skia_src_path)/core/SkValidatingReadBuffer.cpp', '<(skia_src_path)/core/SkWriter32.cpp', '<(skia_src_path)/core/SkXfermode.cpp', @@ -212,6 +221,7 @@ '<(skia_include_path)/core/Sk64.h', '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h', '<(skia_include_path)/core/SkBitmap.h', + '<(skia_include_path)/core/SkBitmapDevice.h', '<(skia_include_path)/core/SkBlitRow.h', '<(skia_include_path)/core/SkBounder.h', '<(skia_include_path)/core/SkCanvas.h', @@ -235,6 +245,7 @@ '<(skia_include_path)/core/SkError.h', '<(skia_include_path)/core/SkFixed.h', '<(skia_include_path)/core/SkFlattenable.h', + '<(skia_include_path)/core/SkFlattenableSerialization.h', '<(skia_include_path)/core/SkFloatBits.h', '<(skia_include_path)/core/SkFloatingPoint.h', '<(skia_include_path)/core/SkFontHost.h', @@ -244,6 +255,7 @@ '<(skia_include_path)/core/SkImageEncoder.h', '<(skia_include_path)/core/SkImageFilter.h', '<(skia_include_path)/core/SkImageFilterUtils.h', + '<(skia_include_path)/core/SkImageInfo.h', '<(skia_include_path)/core/SkInstCnt.h', '<(skia_include_path)/core/SkMallocPixelRef.h', '<(skia_include_path)/core/SkMask.h', @@ -257,6 +269,7 @@ '<(skia_include_path)/core/SkPath.h', '<(skia_include_path)/core/SkPathEffect.h', '<(skia_include_path)/core/SkPathMeasure.h', + '<(skia_include_path)/core/SkPathRef.h', '<(skia_include_path)/core/SkPicture.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', @@ -280,7 +293,6 @@ '<(skia_include_path)/core/SkTInternalLList.h', '<(skia_include_path)/core/SkTileGridPicture.h', '<(skia_include_path)/core/SkTRegistry.h', - '<(skia_include_path)/core/SkTScopedPtr.h', '<(skia_include_path)/core/SkTSearch.h', '<(skia_include_path)/core/SkTemplates.h', '<(skia_include_path)/core/SkThread.h', @@ -311,6 +323,11 @@ '<(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', @@ -361,7 +378,6 @@ '<(skia_src_path)/pathops/SkPathOpsPoint.h', '<(skia_src_path)/pathops/SkPathOpsQuad.h', '<(skia_src_path)/pathops/SkPathOpsRect.h', - '<(skia_src_path)/pathops/SkPathOpsSpan.h', '<(skia_src_path)/pathops/SkPathOpsTriangle.h', '<(skia_src_path)/pathops/SkPathOpsTypes.h', '<(skia_src_path)/pathops/SkPathWriter.h', @@ -0,0 +1,47 @@ +# GYP for "dm" (Diamond Master, a.k.a Dungeon master, a.k.a GM 2). +# vim: set expandtab tabstop=4 shiftwidth=4 +{ + 'includes': [ 'apptype_console.gypi' ], + + 'targets': [{ + 'target_name': 'dm', + 'type': 'executable', + 'include_dirs': [ + '../dm', + '../gm', + '../src/core', + '../src/effects', + '../src/pipe/utils/', + '../src/utils', + '../src/utils/debugger', + ], + 'includes': [ 'gmslides.gypi' ], + 'sources': [ + '../dm/DM.cpp', + '../dm/DMComparisonTask.cpp', + '../dm/DMCpuTask.cpp', + '../dm/DMGpuTask.cpp', + '../dm/DMPipeTask.cpp', + '../dm/DMReplayTask.cpp', + '../dm/DMReporter.cpp', + '../dm/DMSerializeTask.cpp', + '../dm/DMTask.cpp', + '../dm/DMTaskRunner.cpp', + '../dm/DMUtil.cpp', + '../dm/DMWriteTask.cpp', + '../gm/gm.cpp', + '../gm/gm_expectations.cpp', + + '../src/pipe/utils/SamplePipeControllers.cpp', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkObjectParser.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'flags.gyp:flags', + 'jsoncpp.gyp:jsoncpp', + 'gputest.gyp:skgputest', + ], + }] +} diff --git a/edtaa.gyp b/edtaa.gyp new file mode 100755 index 0000000..5c04ce1 --- /dev/null +++ b/edtaa.gyp @@ -0,0 +1,38 @@ +# +# Copyright 2013 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# + + +{ + 'targets': [ + { + 'target_name': 'edtaa', + 'type': 'none', + 'conditions': [ + [ 'skia_distancefield_fonts', { + 'type': 'static_library', + 'sources': [ + '../third_party/edtaa/edtaa3func.cpp', + ], + 'include_dirs': [ + '../third_party/edtaa/', + ], + 'all_dependent_settings': { + 'include_dirs': [ + '../third_party/edtaa/', + ], + }, + }], + ], + }, + ], +} + +# 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 d0b8b4d..7b256d3 100644 --- a/effects.gyp +++ b/effects.gyp @@ -16,6 +16,8 @@ ], 'include_dirs': [ '../include/effects', + '../src/effects', + '../src/opts', '../src/core', ], 'direct_dependent_settings': { diff --git a/effects.gypi b/effects.gypi index 84d38ac..32747ae 100644 --- a/effects.gypi +++ b/effects.gypi @@ -12,6 +12,7 @@ '<(skia_src_path)/effects/SkArithmeticMode.cpp', '<(skia_src_path)/effects/SkAvoidXfermode.cpp', '<(skia_src_path)/effects/SkBicubicImageFilter.cpp', + '<(skia_src_path)/effects/SkBitmapAlphaThresholdShader.cpp', '<(skia_src_path)/effects/SkBitmapSource.cpp', '<(skia_src_path)/effects/SkBlurDrawLooper.cpp', '<(skia_src_path)/effects/SkBlurMask.cpp', @@ -39,6 +40,7 @@ '<(skia_src_path)/effects/SkLayerRasterizer.cpp', '<(skia_src_path)/effects/SkLerpXfermode.cpp', '<(skia_src_path)/effects/SkLightingImageFilter.cpp', + '<(skia_src_path)/effects/SkLumaColorFilter.cpp', '<(skia_src_path)/effects/SkMagnifierImageFilter.cpp', '<(skia_src_path)/effects/SkMatrixConvolutionImageFilter.cpp', '<(skia_src_path)/effects/SkMergeImageFilter.cpp', @@ -53,6 +55,7 @@ '<(skia_src_path)/effects/SkTableColorFilter.cpp', '<(skia_src_path)/effects/SkTableMaskFilter.cpp', '<(skia_src_path)/effects/SkTestImageFilters.cpp', + '<(skia_src_path)/effects/SkTileImageFilter.cpp', '<(skia_src_path)/effects/SkTransparentShader.cpp', '<(skia_src_path)/effects/SkXfermodeImageFilter.cpp', @@ -79,6 +82,7 @@ '<(skia_include_path)/effects/SkXfermodeImageFilter.h', '<(skia_include_path)/effects/SkArithmeticMode.h', '<(skia_include_path)/effects/SkAvoidXfermode.h', + '<(skia_include_path)/effects/SkBitmapAlphaThresholdShader.h', '<(skia_include_path)/effects/SkBitmapSource.h', '<(skia_include_path)/effects/SkBlurDrawLooper.h', '<(skia_include_path)/effects/SkBlurImageFilter.h', @@ -99,6 +103,7 @@ '<(skia_include_path)/effects/SkLayerRasterizer.h', '<(skia_include_path)/effects/SkLerpXfermode.h', '<(skia_include_path)/effects/SkLightingImageFilter.h', + '<(skia_include_path)/effects/SkLumaColorFilter.h', '<(skia_include_path)/effects/SkOffsetImageFilter.h', '<(skia_include_path)/effects/SkMorphologyImageFilter.h', '<(skia_include_path)/effects/SkPaintFlagsDrawFilter.h', @@ -109,6 +114,7 @@ '<(skia_include_path)/effects/SkStippleMaskFilter.h', '<(skia_include_path)/effects/SkTableColorFilter.h', '<(skia_include_path)/effects/SkTableMaskFilter.h', + '<(skia_include_path)/effects/SkTileImageFilter.h', '<(skia_include_path)/effects/SkTransparentShader.h', '<(skia_include_path)/effects/SkMagnifierImageFilter.h', ], diff --git a/everything.gyp b/everything.gyp index 000bb78..9bd825e 100644 --- a/everything.gyp +++ b/everything.gyp @@ -12,12 +12,21 @@ { 'target_name': 'everything', 'type': 'none', - 'dependencies': ['most.gyp:most'], + 'dependencies': [ + 'most.gyp:most', + ], 'conditions': [ - ['skia_os in ("ios", "android") or (skia_os == "mac" and skia_arch_width == 32)', { + ['skia_os in ("ios", "android", "chromeos") or (skia_os == "mac" and skia_arch_width == 32)', { # debugger is not supported on this platform }, { - 'dependencies': [ 'debugger.gyp:debugger' ], + 'dependencies': [ + 'debugger.gyp:debugger', + 'pdfviewer.gyp:pdfviewer', + ], + }], + # DM assumes you've got a GPU. + ['skia_gpu == 1', { + 'dependencies': [ 'dm.gyp:dm' ], }], ], }, diff --git a/experimental.gyp b/experimental.gyp index 5552b4c..76bf071 100644 --- a/experimental.gyp +++ b/experimental.gyp @@ -1,3 +1,4 @@ +# GYP file to build experimental directory. { 'targets': [ { diff --git a/fontconfig.gyp b/fontconfig.gyp new file mode 100644 index 0000000..35f699f --- /dev/null +++ b/fontconfig.gyp @@ -0,0 +1,100 @@ +# GYP for fontconfig ( +# +# This has been tested on Windows and Mac. +# This library is native to Linux, so build from source is not necessary. +# +# Additional files for building under Windows are provided here: (LGPL) +# http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438 + +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'targets': [ + { + 'target_name': 'fontconfig', + 'type': 'static_library', + 'dependencies': [ + 'freetype.gyp:freetype_poppler', + ], + 'include_dirs' : [ + '../third_party/externals/fontconfig', + + '../third_party/fontconfig/config', + '../third_party/fontconfig/config/src', + ], + 'sources': [ + '../third_party/externals/fontconfig/src/fcatomic.c', + '../third_party/externals/fontconfig/src/fcblanks.c', + '../third_party/externals/fontconfig/src/fccache.c', + '../third_party/externals/fontconfig/src/fccfg.c', + '../third_party/externals/fontconfig/src/fccharset.c', + '../third_party/externals/fontconfig/src/fccompat.c', + '../third_party/externals/fontconfig/src/fcdbg.c', + '../third_party/externals/fontconfig/src/fcdefault.c', + '../third_party/externals/fontconfig/src/fcdir.c', + '../third_party/externals/fontconfig/src/fcfreetype.c', + '../third_party/externals/fontconfig/src/fcfs.c', + '../third_party/externals/fontconfig/src/fchash.c', + '../third_party/externals/fontconfig/src/fcinit.c', + '../third_party/externals/fontconfig/src/fclang.c', + '../third_party/externals/fontconfig/src/fclist.c', + '../third_party/externals/fontconfig/src/fcmatch.c', + '../third_party/externals/fontconfig/src/fcmatrix.c', + '../third_party/externals/fontconfig/src/fcname.c', + '../third_party/externals/fontconfig/src/fcobjs.c', + '../third_party/externals/fontconfig/src/fcpat.c', + '../third_party/externals/fontconfig/src/fcserialize.c', + '../third_party/externals/fontconfig/src/fcstat.c', + '../third_party/externals/fontconfig/src/fcstr.c', + '../third_party/externals/fontconfig/src/fcxml.c', + '../third_party/externals/fontconfig/src/ftglue.c', + ], + 'defines': [ + 'HAVE_CONFIG_H', + ], + 'cflags': [ + '-fPIC', + ], + + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/fontconfig', + ], + }, + + 'conditions': [ + ['skia_os == "mac"', { + 'include_dirs': [ + '../third_party/fontconfig/config/mac', + '../third_party/fontconfig/config/mac/src', + ], + 'defines': [ + 'FC_CACHEDIR', + 'FONTCONFIG_PATH', + ], + 'libraries': [ + '$(SDKROOT)/usr/lib/libexpat.dylib', + ], + 'xcode_settings': { + 'DYLIB_INSTALL_NAME_BASE': '@executable_path', + }, + }], + ['skia_os == "win"', { + 'include_dirs': [ + '../third_party/fontconfig/config/windows', + '../third_party/fontconfig/config/windows/src', + ], + 'sources!': [ + '../third_party/externals/fontconfig/src/fccompat.c', + '../third_party/externals/fontconfig/src/fcxml.c', + ], + 'defines': [ + # inline is not recognized in C and has to be __inline + 'inline=__inline', + ], + }], + ], + }, + ], +} diff --git a/freetype.gyp b/freetype.gyp index 91c92b7..30afb06 100644 --- a/freetype.gyp +++ b/freetype.gyp @@ -46,69 +46,20 @@ # we are dependent upon PNG for color emoji glyphs 'images.gyp:images' ], - 'sources': [ - # base components (required) - '../third_party/externals/freetype/src/base/ftsystem.c', - '../third_party/externals/freetype/src/base/ftinit.c', - '../third_party/externals/freetype/src/base/ftdebug.c', - '../third_party/externals/freetype/src/base/ftbase.c', - - '../third_party/externals/freetype/src/base/ftbbox.c', # recommended, see <freetype/ftbbox.h> - '../third_party/externals/freetype/src/base/ftglyph.c', # recommended, see <freetype/ftglyph.h> - - '../third_party/externals/freetype/src/base/ftbitmap.c', # optional, see <freetype/ftbitmap.h> - '../third_party/externals/freetype/src/base/ftfstype.c', # optional - '../third_party/externals/freetype/src/base/ftgasp.c', # optional, see <freetype/ftgasp.h> - '../third_party/externals/freetype/src/base/ftlcdfil.c', # optional, see <freetype/ftlcdfil.h> - '../third_party/externals/freetype/src/base/ftmm.c', # optional, see <freetype/ftmm.h> - '../third_party/externals/freetype/src/base/ftpatent.c', # optional - '../third_party/externals/freetype/src/base/ftstroke.c', # optional, see <freetype/ftstroke.h> - '../third_party/externals/freetype/src/base/ftsynth.c', # optional, see <freetype/ftsynth.h> - '../third_party/externals/freetype/src/base/fttype1.c', # optional, see <freetype/t1tables.h> - '../third_party/externals/freetype/src/base/ftwinfnt.c', # optional, see <freetype/ftwinfnt.h> - '../third_party/externals/freetype/src/base/ftxf86.c', # optional, see <freetype/ftxf86.h> - - # font drivers (optional; at least one is needed) - '../third_party/externals/freetype/src/cff/cff.c', # CFF/OpenType font driver - '../third_party/externals/freetype/src/sfnt/sfnt.c', # SFNT files support (TrueType & OpenType) - '../third_party/externals/freetype/src/truetype/truetype.c', # TrueType font driver - - # rasterizers (optional; at least one is needed for vector formats) - '../third_party/externals/freetype/src/raster/raster.c', # monochrome rasterizer - '../third_party/externals/freetype/src/smooth/smooth.c', # anti-aliasing rasterizer - - # auxiliary modules (optional) - '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module - '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module - '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support + 'includes': [ + # common freetype sources needed for both the base Skia build and the + # libpoppler build for testing only + 'freetype.gypi', ], 'include_dirs': [ '../third_party/freetype/include_overrides', - '../third_party/externals/freetype/internal', - '../third_party/externals/freetype/builds', - '../third_party/externals/freetype/include', - '../third_party/externals/freetype', - ], - 'cflags': [ - '-DFT2_BUILD_LIBRARY', ], 'direct_dependent_settings': { 'include_dirs': [ '../third_party/freetype/include_overrides', - '../third_party/externals/freetype/include', ], }, 'conditions': [ - [ 'skia_warnings_as_errors', { - 'cflags!': [ - '-Werror', - ], - }], - [ 'skia_os == "mac"', { - 'sources': [ - '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh - ], - }], [ 'skia_os == "android"', { # These flags are used by the Android OS. They are probably overkill # for Skia, but we add them for consistency. @@ -124,6 +75,31 @@ }], ], }, + { + 'target_name': 'freetype_poppler', + 'type': 'static_library', + 'standalone_static_library': 1, + 'includes': [ + 'freetype.gypi', + ], + 'sources': [ + # additional components used by poppler + '../third_party/externals/freetype/src/base/ftbdf.c', + '../third_party/externals/freetype/src/base/ftpfr.c', + + '../third_party/externals/freetype/src/bdf/bdf.c', + '../third_party/externals/freetype/src/cid/type1cid.c', + '../third_party/externals/freetype/src/pcf/pcf.c', + '../third_party/externals/freetype/src/pfr/pfr.c', + '../third_party/externals/freetype/src/psaux/psaux.c', + '../third_party/externals/freetype/src/type1/type1.c', + '../third_party/externals/freetype/src/type42/type42.c', + '../third_party/externals/freetype/src/winfonts/winfnt.c', + + '../third_party/externals/freetype/src/gzip/ftgzip.c', + '../third_party/externals/freetype/src/lzw/ftlzw.c', + ], + }, ], } diff --git a/freetype.gypi b/freetype.gypi new file mode 100644 index 0000000..ace5d04 --- /dev/null +++ b/freetype.gypi @@ -0,0 +1,64 @@ +{ + 'sources': [ + # base components (required) + '../third_party/externals/freetype/src/base/ftsystem.c', + '../third_party/externals/freetype/src/base/ftinit.c', + '../third_party/externals/freetype/src/base/ftdebug.c', + '../third_party/externals/freetype/src/base/ftbase.c', + + '../third_party/externals/freetype/src/base/ftbbox.c', # recommended, see <freetype/ftbbox.h> + '../third_party/externals/freetype/src/base/ftglyph.c', # recommended, see <freetype/ftglyph.h> + + '../third_party/externals/freetype/src/base/ftbitmap.c', # optional, see <freetype/ftbitmap.h> + '../third_party/externals/freetype/src/base/ftfstype.c', # optional + '../third_party/externals/freetype/src/base/ftgasp.c', # optional, see <freetype/ftgasp.h> + '../third_party/externals/freetype/src/base/ftlcdfil.c', # optional, see <freetype/ftlcdfil.h> + '../third_party/externals/freetype/src/base/ftmm.c', # optional, see <freetype/ftmm.h> + '../third_party/externals/freetype/src/base/ftpatent.c', # optional + '../third_party/externals/freetype/src/base/ftstroke.c', # optional, see <freetype/ftstroke.h> + '../third_party/externals/freetype/src/base/ftsynth.c', # optional, see <freetype/ftsynth.h> + '../third_party/externals/freetype/src/base/fttype1.c', # optional, see <freetype/t1tables.h> + '../third_party/externals/freetype/src/base/ftwinfnt.c', # optional, see <freetype/ftwinfnt.h> + '../third_party/externals/freetype/src/base/ftxf86.c', # optional, see <freetype/ftxf86.h> + + # font drivers (optional; at least one is needed) + '../third_party/externals/freetype/src/cff/cff.c', # CFF/OpenType font driver + '../third_party/externals/freetype/src/sfnt/sfnt.c', # SFNT files support (TrueType & OpenType) + '../third_party/externals/freetype/src/truetype/truetype.c', # TrueType font driver + + # rasterizers (optional; at least one is needed for vector formats) + '../third_party/externals/freetype/src/raster/raster.c', # monochrome rasterizer + '../third_party/externals/freetype/src/smooth/smooth.c', # anti-aliasing rasterizer + + # auxiliary modules (optional) + '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module + '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module + '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support + ], + 'include_dirs': [ + '../third_party/externals/freetype/internal', + '../third_party/externals/freetype/builds', + '../third_party/externals/freetype/include', + '../third_party/externals/freetype', + ], + 'defines': [ + 'FT2_BUILD_LIBRARY', + ], + 'conditions': [ + [ 'skia_warnings_as_errors', { + 'cflags!': [ + '-Werror', + ], + }], + [ 'skia_os == "mac"', { + 'sources': [ + '../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh + ], + }], + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/freetype/include', + ], + }, +} @@ -60,6 +60,28 @@ 'pdf.gyp:pdf', ], 'conditions': [ + ['skia_run_pdfviewer_in_gm', { + 'defines': [ + 'SK_BUILD_NATIVE_PDF_RENDERER', + ], + 'include_dirs' : [ + '../experimental/PdfViewer/inc', + ], + 'dependencies': [ + 'pdfviewer_lib.gyp:pdfviewer_lib', + ], + }], + ['skia_os in ["linux", "mac", "win"]', { + 'dependencies': [ + 'poppler.gyp:libpoppler-cpp-gpl', + ], + 'sources': [ + '../src/utils/SkPDFRasterizer.cpp', + ], + 'defines': [ + 'SK_BUILD_POPPLER', + ], + }], ['skia_os == "mac"', { 'sources!': [ '../gm/system_preferences_default.cpp', @@ -83,6 +105,9 @@ 'include_dirs': [ '../src/gpu', ], + 'dependencies': [ + 'gputest.gyp:skgputest', + ], }], ], }, diff --git a/gmslides.gypi b/gmslides.gypi index 8d0b2e9..542de0f 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -4,14 +4,19 @@ '../gm/aaclip.cpp', '../gm/aarectmodes.cpp', '../gm/alphagradients.cpp', + '../gm/androidfallback.cpp', '../gm/arcofzorro.cpp', '../gm/arithmode.cpp', + '../gm/beziereffects.cpp', '../gm/bicubicfilter.cpp', + '../gm/bigblurs.cpp', '../gm/bigmatrix.cpp', '../gm/bigtext.cpp', + '../gm/bitmapalphathreshold.cpp', '../gm/bitmapcopy.cpp', '../gm/bitmapmatrix.cpp', '../gm/bitmapfilters.cpp', + '../gm/bitmappremul.cpp', '../gm/bitmaprect.cpp', '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', @@ -19,7 +24,12 @@ '../gm/blurs.cpp', '../gm/blurquickreject.cpp', '../gm/blurrect.cpp', + '../gm/blurroundrect.cpp', + '../gm/canvasstate.cpp', '../gm/circles.cpp', + '../gm/circularclips.cpp', + '../gm/clippedbitmapshaders.cpp', + '../gm/coloremoji.cpp', '../gm/colorfilterimagefilter.cpp', '../gm/colormatrix.cpp', '../gm/colortype.cpp', @@ -47,12 +57,14 @@ '../gm/filltypes.cpp', '../gm/filltypespersp.cpp', '../gm/filterbitmap.cpp', + '../gm/fontcache.cpp', '../gm/fontmgr.cpp', '../gm/fontscaler.cpp', '../gm/gammatext.cpp', '../gm/getpostextpath.cpp', '../gm/giantbitmap.cpp', '../gm/gradients.cpp', + '../gm/gradients_no_texture.cpp', '../gm/gradientDirtyLaundry.cpp', '../gm/gradient_matrix.cpp', '../gm/gradtext.cpp', @@ -64,6 +76,7 @@ '../gm/inversepaths.cpp', '../gm/lerpmode.cpp', '../gm/lighting.cpp', + '../gm/lumafilter.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefilterscropped.cpp', @@ -76,8 +89,10 @@ '../gm/mixedxfermodes.cpp', '../gm/modecolorfilters.cpp', '../gm/morphology.cpp', + '../gm/nested.cpp', '../gm/ninepatchstretch.cpp', - '../gm/nocolorbleed.cpp', + '../gm/nonclosedpaths.cpp', + '../gm/offsetimagefilter.cpp', '../gm/optimizations.cpp', '../gm/ovals.cpp', '../gm/patheffects.cpp', @@ -104,6 +119,8 @@ '../gm/shadows.cpp', '../gm/shallowgradient.cpp', '../gm/simpleaaclip.cpp', + '../gm/skbug1719.cpp', + '../gm/stringart.cpp', '../gm/spritebitmap.cpp', '../gm/srcmode.cpp', '../gm/strokefill.cpp', @@ -116,7 +133,9 @@ '../gm/texdata.cpp', '../gm/thinrects.cpp', '../gm/thinstrokedrects.cpp', + '../gm/tileimagefilter.cpp', '../gm/tilemodes.cpp', + '../gm/tilemodes_scaled.cpp', '../gm/tinybitmap.cpp', '../gm/twopointradial.cpp', '../gm/typeface.cpp', @@ -126,6 +145,7 @@ '../gm/xfermodeimagefilter.cpp', '../gm/xfermodes.cpp', '../gm/xfermodes2.cpp', + '../gm/xfermodes3.cpp', ], } @@ -25,31 +25,6 @@ 'sources/': [ ['exclude', '_nacl.(h|cpp)$'], ], }], - [ 'skia_os == "android"', { - 'defines': [ - 'GR_ANDROID_BUILD=1', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'skia_os == "linux" or skia_os == "chromeos"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'skia_os == "ios"', { - 'defines': [ - 'GR_IOS_BUILD=1', - ], - }], - [ 'skia_os == "win"', { - 'defines': [ - 'GR_WIN32_BUILD=1', - ], - }], # nullify the targets in this gyp file if skia_gpu is 0 [ 'skia_gpu == 0', { 'sources/': [ @@ -75,37 +50,21 @@ ], }, }], - [ 'skia_texture_cache_mb_limit != 0', { + [ 'skia_resource_cache_mb_limit != 0', { 'defines': [ - 'GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT=<(skia_texture_cache_mb_limit)', + 'GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT=<(skia_resource_cache_mb_limit)', + ], + }], + [ 'skia_resource_cache_count_limit != 0', { + 'defines': [ + 'GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT=<(skia_resource_cache_count_limit)', ], }], ], 'direct_dependent_settings': { 'conditions': [ - [ 'skia_os == "android"', { - 'defines': [ - 'GR_ANDROID_BUILD=1', - ], - }], - [ 'skia_os == "mac"', { - 'defines': [ - 'GR_MAC_BUILD=1', - ], - }], - [ 'skia_os == "linux"', { - 'defines': [ - 'GR_LINUX_BUILD=1', - ], - }], - [ 'skia_os == "ios"', { - 'defines': [ - 'GR_IOS_BUILD=1', - ], - }], [ 'skia_os == "win"', { 'defines': [ - 'GR_WIN32_BUILD=1', 'GR_GL_FUNCTION_TYPE=__stdcall', ], }], @@ -124,6 +83,7 @@ 'dependencies': [ 'angle.gyp:*', 'core.gyp:*', + 'edtaa.gyp:*', 'utils.gyp:*', ], 'includes': [ @@ -146,9 +106,6 @@ '<@(skgpu_null_gl_sources)', 'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], - 'defines': [ - 'GR_IMPLEMENTATION=1', - ], 'conditions': [ [ 'skia_nv_path_rendering', { 'defines': [ @@ -176,6 +133,17 @@ 'GR_ANDROID_PATH_RENDERING=1', ], }], + [ 'skia_distancefield_fonts', { + 'sources': [ + '<(skia_include_path)/gpu/GrDistanceFieldTextContext.h', + '<(skia_src_path)/gpu/GrDistanceFieldTextContext.cpp', + '<(skia_src_path)/gpu/effects/GrDistanceFieldTextureEffect.cpp', + '<(skia_src_path)/gpu/effects/GrDistanceFieldTextureEffect.h', + ], + 'defines': [ + 'GR_DISTANCEFIELD_FONTS=1', + ], + }], [ 'skia_os == "linux" or skia_os == "chromeos"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', @@ -8,26 +8,24 @@ { 'variables': { 'skgpu_sources': [ - '<(skia_include_path)/gpu/GrAARectRenderer.h', '<(skia_include_path)/gpu/GrBackendEffectFactory.h', + '<(skia_include_path)/gpu/GrBitmapTextContext.h', '<(skia_include_path)/gpu/GrClipData.h', '<(skia_include_path)/gpu/GrColor.h', '<(skia_include_path)/gpu/GrConfig.h', '<(skia_include_path)/gpu/GrContext.h', '<(skia_include_path)/gpu/GrContextFactory.h', + '<(skia_include_path)/gpu/GrCoordTransform.h', '<(skia_include_path)/gpu/GrEffect.h', '<(skia_include_path)/gpu/GrEffectStage.h', '<(skia_include_path)/gpu/GrEffectUnitTest.h', '<(skia_include_path)/gpu/GrFontScaler.h', '<(skia_include_path)/gpu/GrGlyph.h', '<(skia_include_path)/gpu/GrKey.h', - '<(skia_include_path)/gpu/GrNoncopyable.h', - '<(skia_include_path)/gpu/GrOvalRenderer.h', '<(skia_include_path)/gpu/GrPaint.h', '<(skia_include_path)/gpu/GrPathRendererChain.h', '<(skia_include_path)/gpu/GrPoint.h', '<(skia_include_path)/gpu/GrRect.h', - '<(skia_include_path)/gpu/GrRefCnt.h', '<(skia_include_path)/gpu/GrRenderTarget.h', '<(skia_include_path)/gpu/GrResource.h', '<(skia_include_path)/gpu/GrSurface.h', @@ -48,6 +46,7 @@ '<(skia_src_path)/gpu/GrAAConvexPathRenderer.cpp', '<(skia_src_path)/gpu/GrAAConvexPathRenderer.h', '<(skia_src_path)/gpu/GrAARectRenderer.cpp', + '<(skia_src_path)/gpu/GrAARectRenderer.h', '<(skia_src_path)/gpu/GrAddPathRenderers_default.cpp', '<(skia_src_path)/gpu/GrAllocator.h', '<(skia_src_path)/gpu/GrAllocPool.h', @@ -55,6 +54,9 @@ '<(skia_src_path)/gpu/GrAtlas.cpp', '<(skia_src_path)/gpu/GrAtlas.h', '<(skia_src_path)/gpu/GrBinHashKey.h', + '<(skia_src_path)/gpu/GrBitmapTextContext.cpp', + '<(skia_src_path)/gpu/GrBlend.cpp', + '<(skia_src_path)/gpu/GrBlend.h', '<(skia_src_path)/gpu/GrBufferAllocPool.cpp', '<(skia_src_path)/gpu/GrBufferAllocPool.h', '<(skia_src_path)/gpu/GrCacheID.cpp', @@ -80,10 +82,10 @@ '<(skia_src_path)/gpu/GrIndexBuffer.h', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.cpp', '<(skia_src_path)/gpu/GrInOrderDrawBuffer.h', - '<(skia_src_path)/gpu/GrMemory.cpp', '<(skia_src_path)/gpu/GrMemoryPool.cpp', '<(skia_src_path)/gpu/GrMemoryPool.h', '<(skia_src_path)/gpu/GrOvalRenderer.cpp', + '<(skia_src_path)/gpu/GrOvalRenderer.h', '<(skia_src_path)/gpu/GrPaint.cpp', '<(skia_src_path)/gpu/GrPath.cpp', '<(skia_src_path)/gpu/GrPath.h', @@ -95,6 +97,7 @@ '<(skia_src_path)/gpu/GrPlotMgr.h', '<(skia_src_path)/gpu/GrRectanizer.cpp', '<(skia_src_path)/gpu/GrRectanizer.h', + '<(skia_src_path)/gpu/GrRectanizer_skyline.cpp', '<(skia_src_path)/gpu/GrRedBlackTree.h', '<(skia_src_path)/gpu/GrRenderTarget.cpp', '<(skia_src_path)/gpu/GrReducedClip.cpp', @@ -121,15 +124,21 @@ '<(skia_src_path)/gpu/GrTextStrike_impl.h', '<(skia_src_path)/gpu/GrTexture.cpp', '<(skia_src_path)/gpu/GrTextureAccess.cpp', - '<(skia_src_path)/gpu/GrTHashCache.h', + '<(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', '<(skia_src_path)/gpu/effects/GrConfigConversionEffect.h', + '<(skia_src_path)/gpu/effects/GrBezierEffect.cpp', + '<(skia_src_path)/gpu/effects/GrBezierEffect.h', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.cpp', '<(skia_src_path)/gpu/effects/GrConvolutionEffect.h', + '<(skia_src_path)/gpu/effects/GrBicubicEffect.cpp', + '<(skia_src_path)/gpu/effects/GrBicubicEffect.h', + '<(skia_src_path)/gpu/effects/GrCustomCoordsTextureEffect.cpp', + '<(skia_src_path)/gpu/effects/GrCustomCoordsTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', @@ -148,11 +157,9 @@ '<(skia_src_path)/gpu/gl/GrGLCreateNativeInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_none.cpp', '<(skia_src_path)/gpu/gl/GrGLDefines.h', - '<(skia_src_path)/gpu/gl/GrGLEffect.cpp', '<(skia_src_path)/gpu/gl/GrGLEffect.h', + '<(skia_src_path)/gpu/gl/GrGLVertexEffect.h', '<(skia_src_path)/gpu/gl/GrGLExtensions.cpp', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.cpp', - '<(skia_src_path)/gpu/gl/GrGLEffectMatrix.h', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp', '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h', '<(skia_src_path)/gpu/gl/GrGLInterface.cpp', @@ -165,6 +172,8 @@ '<(skia_src_path)/gpu/gl/GrGLProgram.h', '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp', '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h', + '<(skia_src_path)/gpu/gl/GrGLProgramEffects.cpp', + '<(skia_src_path)/gpu/gl/GrGLProgramEffects.h', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp', '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h', '<(skia_src_path)/gpu/gl/GrGLShaderBuilder.cpp', diff --git a/gputest.gyp b/gputest.gyp new file mode 100644 index 0000000..c673f20 --- /dev/null +++ b/gputest.gyp @@ -0,0 +1,37 @@ +{ + 'targets': [ + { + 'target_name': 'skgputest', + 'product_name': 'skia_skgputest', + 'type': 'static_library', + 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], + 'include_dirs': [ + '../include/gpu', + '../include/utils', + '../src/core', + '../src/gpu', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../src/gpu', + ], + }, + 'sources': [ + '<(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: diff --git a/iconv.gyp b/iconv.gyp new file mode 100644 index 0000000..fbe16f7 --- /dev/null +++ b/iconv.gyp @@ -0,0 +1,43 @@ +# GYP for iconv +# +# NOTE: WINDOWS BUILD ONLY. +# iconv should be native to Mac and Linux. +# +# Based on instructions found on http://www.codeproject.com/Articles/302012/How-to-Build-libiconv-with-Microsoft-Visual-Studio +# See the relevant README.chromium file for more information. + +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'targets': [ + { + 'target_name': 'iconv', + 'type': 'static_library', + 'include_dirs' : [ + '../third_party/externals/iconv/lib', + '../third_party/iconv/config', + ], + 'sources': [ + '../third_party/externals/iconv/lib/iconv.c', + '../third_party/externals/iconv/libcharset/lib/localcharset.c', + ], + + 'conditions': [ + ['skia_os == "win"', { + 'include_dirs': [ + '../third_party/iconv/config/windows', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/iconv/config/windows', + ], + }, + 'defines': [ + 'LIBDIR', + ], + }], + ], + }, + ], +} @@ -18,10 +18,13 @@ 'include_dirs': [ '../include/images', '../include/lazy', + '../src/lazy', # for access to SkErrorInternals.h '../src/core/', # for access to SkImagePriv.h '../src/image/', + # So src/ports/SkImageDecoder_CG can access SkStreamHelpers.h + '../src/images/', ], 'sources': [ '../include/images/SkForceLinking.h', @@ -34,6 +37,7 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', + '../src/images/SkDecodingImageGenerator.cpp', '../src/images/SkForceLinking.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', @@ -64,6 +68,8 @@ '../src/images/SkPageFlipper.cpp', '../src/images/SkScaledBitmapSampler.cpp', '../src/images/SkScaledBitmapSampler.h', + '../src/images/SkStreamHelpers.cpp', + '../src/images/SkStreamHelpers.h', '../src/ports/SkImageDecoder_CG.cpp', '../src/ports/SkImageDecoder_WIC.cpp', diff --git a/jsoncpp.gyp b/jsoncpp.gyp index ab00db9..390f8f9 100644 --- a/jsoncpp.gyp +++ b/jsoncpp.gyp @@ -49,12 +49,8 @@ '../third_party/externals/jsoncpp/include/', ], }, - 'conditions': [ - [ 'skia_os == "android"', { - 'cflags!': [ - '-Wall', - ], - }], + 'cflags': [ + '-w', ], }, ], diff --git a/libwebp.gyp b/libwebp.gyp index 17e0026..1f8689a 100644 --- a/libwebp.gyp +++ b/libwebp.gyp @@ -112,6 +112,7 @@ '../third_party/externals/libwebp/src/enc/vp8l.c', '../third_party/externals/libwebp/src/enc/webpenc.c', ], + 'cflags': [ '-w' ], }, { 'target_name': 'libwebp_utils', @@ -18,11 +18,12 @@ 'tests.gyp:tests', 'tools.gyp:tools', 'pathops_unittest.gyp:*', + 'skpskgr_test.gyp:*', # 'pdfviewer.gyp:pdfviewer', ], 'conditions': [ ['skia_os == "android"', { - 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], + 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ], }, @@ -51,7 +51,10 @@ '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', '../src/opts/SkBlitRect_opts_SSE2.cpp', + '../src/opts/SkBlurImage_opts_SSE2.cpp', + '../src/opts/SkMorphology_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', + '../src/opts/SkXfermode_opts_none.cpp', ], }], [ 'skia_arch_type == "arm" and arm_version >= 7', { @@ -73,8 +76,11 @@ '../src/opts/opts_check_arm.cpp', '../src/opts/memset.arm.S', '../src/opts/SkBitmapProcState_opts_arm.cpp', + '../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': [ [ 'arm_neon == 1 or arm_neon_optional == 1', { @@ -95,8 +101,12 @@ [ '(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', '../src/opts/SkBlitRow_opts_none.cpp', + '../src/opts/SkBlurImage_opts_none.cpp', + '../src/opts/SkMorphology_opts_none.cpp', '../src/opts/SkUtils_opts_none.cpp', + '../src/opts/SkXfermode_opts_none.cpp', ], }], ], @@ -168,6 +178,8 @@ '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', '../src/opts/SkBlitRow_opts_arm_neon.cpp', + '../src/opts/SkMorphology_opts_neon.cpp', + '../src/opts/SkXfermode_opts_arm_neon.cpp', ], }, ], diff --git a/pathops.gypi b/pathops.gypi index 5daa0fd..3bb163e 100644 --- a/pathops.gypi +++ b/pathops.gypi @@ -52,7 +52,6 @@ '../src/pathops/SkPathOpsPoint.h', '../src/pathops/SkPathOpsQuad.h', '../src/pathops/SkPathOpsRect.h', - '../src/pathops/SkPathOpsSpan.h', '../src/pathops/SkPathOpsTriangle.h', '../src/pathops/SkPathOpsTypes.h', '../src/pathops/SkPathWriter.h', diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index c7c32ef..ea4e5b8 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -22,6 +22,7 @@ 'pathops_unittest.gypi', ], 'sources': [ + '../tests/PathOpsSkpClipTest.cpp', '../tests/Test.cpp', '../tests/skia_test.cpp', '../tests/Test.h', diff --git a/pathops_unittest.gypi b/pathops_unittest.gypi index dfbc89c..e9f40d6 100644 --- a/pathops_unittest.gypi +++ b/pathops_unittest.gypi @@ -35,6 +35,7 @@ '../tests/PathOpsSimplifyRectThreadedTest.cpp', '../tests/PathOpsSimplifyTest.cpp', '../tests/PathOpsSimplifyTrianglesThreadedTest.cpp', + '../tests/PathOpsSkpTest.cpp', '../tests/PathOpsTestCommon.cpp', '../tests/PathOpsThreadedCommon.cpp', '../tests/PathOpsCubicIntersectionTestData.h', @@ -15,10 +15,13 @@ 'include_dirs': [ '../include/pdf', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h + '../src/pdf', '../src/utils', # needed to get SkBitSet.h ], 'sources': [ 'pdf.gypi', # Makes the gypi appear in IDEs (but does not modify the build). + + '../src/doc/SkDocument_PDF.cpp', # Chromium does use this file ], # This section makes all targets that depend on this target # #define SK_SUPPORT_PDF and have access to the pdf header files. @@ -13,6 +13,8 @@ '<(skia_src_path)/pdf/SkPDFCatalog.cpp', '<(skia_src_path)/pdf/SkPDFCatalog.h', '<(skia_src_path)/pdf/SkPDFDevice.cpp', + '<(skia_src_path)/pdf/SkPDFDeviceFlattener.cpp', + '<(skia_src_path)/pdf/SkPDFDeviceFlattener.h', '<(skia_src_path)/pdf/SkPDFDocument.cpp', '<(skia_src_path)/pdf/SkPDFFont.cpp', '<(skia_src_path)/pdf/SkPDFFont.h', @@ -23,8 +25,6 @@ '<(skia_src_path)/pdf/SkPDFGraphicState.h', '<(skia_src_path)/pdf/SkPDFImage.cpp', '<(skia_src_path)/pdf/SkPDFImage.h', - '<(skia_src_path)/pdf/SkPDFImageStream.cpp', - '<(skia_src_path)/pdf/SkPDFImageStream.h', '<(skia_src_path)/pdf/SkPDFPage.cpp', '<(skia_src_path)/pdf/SkPDFPage.h', '<(skia_src_path)/pdf/SkPDFResourceDict.cpp', @@ -38,8 +38,6 @@ '<(skia_src_path)/pdf/SkPDFUtils.cpp', '<(skia_src_path)/pdf/SkPDFUtils.h', '<(skia_src_path)/pdf/SkTSet.h', - - '<(skia_src_path)/doc/SkDocument_PDF.cpp', ], } diff --git a/pdfviewer.gyp b/pdfviewer.gyp index 063c294..7635877 100644 --- a/pdfviewer.gyp +++ b/pdfviewer.gyp @@ -9,97 +9,22 @@ ], 'targets': [ { - 'target_name': 'libpdfviewer', - 'type': 'static_library', - 'sources': [ - '../experimental/PdfViewer/SkPdfBasics.cpp', - '../experimental/PdfViewer/SkPdfFont.cpp', - '../experimental/PdfViewer/SkPdfRenderer.cpp', - '../experimental/PdfViewer/SkPdfUtils.cpp', - #'../experimental/PdfViewer/SkPdfNYI.cpp', - '../experimental/PdfViewer/SkTrackDevice.cpp', - '../experimental/PdfViewer/SkTracker.cpp', - '../experimental/PdfViewer/pdfparser/native/SkPdfObject.cpp', - '../experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp', - '../experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.cpp', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.cpp', - ], - 'copies': [ - { - 'files': [ - '../experimental/PdfViewer/datatypes.py', - '../experimental/PdfViewer/generate_code.py', - ], - 'destination': '<(SHARED_INTERMEDIATE_DIR)', - }, - ], - 'actions': [ - { - 'action_name': 'spec2def', - 'inputs': [ - '../experimental/PdfViewer/spec2def.py', - '../experimental/PdfViewer/PdfReference-okular-1.txt', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py', - ], - 'action': ['python', '../experimental/PdfViewer/spec2def.py', '../experimental/PdfViewer/PdfReference-okular-1.txt', '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py'], - }, - { - 'action_name': 'generate_code', - 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/datatypes.py', - '<(SHARED_INTERMEDIATE_DIR)/generate_code.py', - '<(SHARED_INTERMEDIATE_DIR)/pdfspec_autogen.py', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfEnums_autogen.h', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.h', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.h', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfMapper_autogen.cpp', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen/SkPdfHeaders_autogen.cpp', - # TODO(edisonn): ok, there are many more files here, which we should list but since - # any change in the above should trigger a change here, we should be fine normally - ], - 'action': ['python', '<(SHARED_INTERMEDIATE_DIR)/generate_code.py', '<(SHARED_INTERMEDIATE_DIR)'], - }, - ], - 'include_dirs': [ - '../experimental/PdfViewer', - '../experimental/PdfViewer/pdfparser', - '../experimental/PdfViewer/pdfparser/native', - '<(SHARED_INTERMEDIATE_DIR)/native/autogen', - ], - 'dependencies': [ - 'core.gyp:core', - 'effects.gyp:effects', - 'images.gyp:images', - 'zlib.gyp:zlib', - ], - }, - { 'target_name': 'pdfviewer', 'type': 'executable', - 'cflags': ['-fexceptions'], - 'cflags_cc': ['-fexceptions'], - 'cflags!': [ '-fno-exceptions' ], - 'cflags_cc!': [ '-fno-exceptions' ], 'sources': [ '../experimental/PdfViewer/pdf_viewer_main.cpp', ], 'include_dirs': [ '../experimental/PdfViewer', + '../experimental/PdfViewer/inc', '../experimental/PdfViewer/pdfparser', - '../experimental/PdfViewer/pdfparser/autogen', '../experimental/PdfViewer/pdfparser/native', - '../experimental/PdfViewer/pdfparser/native/autogen', ], 'dependencies': [ - 'core.gyp:core', - 'flags.gyp:flags', - 'libpdfviewer', 'chop_transparency', + 'flags.gyp:flags', + 'pdfviewer_lib.gyp:pdfviewer_lib', + 'skia_lib.gyp:skia_lib', ], }, { @@ -113,8 +38,8 @@ '../src/utils/', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', ], }, ], diff --git a/pdfviewer_lib.gyp b/pdfviewer_lib.gyp new file mode 100644 index 0000000..37b1285 --- /dev/null +++ b/pdfviewer_lib.gyp @@ -0,0 +1,55 @@ +# GYP file to build pdfviewer. +# +# To build on Linux: +# ./gyp_skia pdfviewer.gyp && make pdfviewer +# +{ + 'targets': [ + { + 'target_name': 'pdfviewer_lib', + 'type': 'static_library', + 'sources': [ + # 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/SkPdfRenderer.h', + '../experimental/PdfViewer/inc/SkPdfTokenLooper.h', + + '../experimental/PdfViewer/src/SkPdfContext.cpp', + '../experimental/PdfViewer/src/SkPdfRenderer.cpp', + '../experimental/PdfViewer/src/SkTDStackNester.h', + + '../experimental/PdfViewer/SkPdfGraphicsState.cpp', + '../experimental/PdfViewer/SkPdfFont.cpp', + '../experimental/PdfViewer/SkPdfReporter.cpp', + '../experimental/PdfViewer/SkPdfUtils.cpp', + #'../experimental/PdfViewer/SkPdfNYI.cpp', + '../experimental/PdfViewer/SkTrackDevice.cpp', + '../experimental/PdfViewer/SkTracker.cpp', + '../experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp', + '../experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp', + '../experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp', + '../experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.cpp', + '../experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.cpp', + ], + 'include_dirs': [ + '../experimental/PdfViewer', + '../experimental/PdfViewer/inc', + '../experimental/PdfViewer/src', + '../experimental/PdfViewer/pdfparser', + '../experimental/PdfViewer/pdfparser/native', + '../experimental/PdfViewer/pdfparser/native/pdfapi', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'zlib.gyp:zlib', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/poppler.gyp b/poppler.gyp new file mode 100644 index 0000000..027aea3 --- /dev/null +++ b/poppler.gyp @@ -0,0 +1,235 @@ +# GYP for libpoppler, a PDF rendering library. +# +# !!! WARNING !!! Poppler is GPL software, and should not be used in anything +# except testing code. Or the lawyercats won't be happy. +# +# libpoppler should be statically linked (doesn't have DLL exports), +# but libpopper-cpp can be dynamically linked. + +{ + 'variables': { + 'skia_warnings_as_errors': 0, + }, + 'targets': [ + { + 'target_name': 'libpoppler-gpl', + 'type': 'static_library', + 'include_dirs' : [ + '../third_party/externals/poppler', + '../third_party/externals/poppler/goo', + ], + 'sources': [ + '../third_party/externals/poppler/fofi/FoFiBase.cc', + '../third_party/externals/poppler/fofi/FoFiEncodings.cc', + '../third_party/externals/poppler/fofi/FoFiIdentifier.cc', + '../third_party/externals/poppler/fofi/FoFiTrueType.cc', + '../third_party/externals/poppler/fofi/FoFiType1.cc', + '../third_party/externals/poppler/fofi/FoFiType1C.cc', + '../third_party/externals/poppler/goo/FixedPoint.cc', + '../third_party/externals/poppler/goo/gfile.cc', + '../third_party/externals/poppler/goo/gmem.cc', + '../third_party/externals/poppler/goo/gmempp.cc', + '../third_party/externals/poppler/goo/GooHash.cc', + '../third_party/externals/poppler/goo/GooList.cc', + '../third_party/externals/poppler/goo/GooString.cc', + '../third_party/externals/poppler/goo/GooTimer.cc', + '../third_party/externals/poppler/goo/grandom.cc', + '../third_party/externals/poppler/goo/gstrtod.cc', + '../third_party/externals/poppler/goo/ImgWriter.cc', + '../third_party/externals/poppler/goo/JpegWriter.cc', + '../third_party/externals/poppler/goo/PNGWriter.cc', + '../third_party/externals/poppler/goo/TiffWriter.cc', + '../third_party/externals/poppler/poppler/Annot.cc', + '../third_party/externals/poppler/poppler/Array.cc', + '../third_party/externals/poppler/poppler/BuiltinFont.cc', + '../third_party/externals/poppler/poppler/BuiltinFontTables.cc', + '../third_party/externals/poppler/poppler/CachedFile.cc', + '../third_party/externals/poppler/poppler/Catalog.cc', + '../third_party/externals/poppler/poppler/CharCodeToUnicode.cc', + '../third_party/externals/poppler/poppler/CMap.cc', + '../third_party/externals/poppler/poppler/DateInfo.cc', + '../third_party/externals/poppler/poppler/Decrypt.cc', + '../third_party/externals/poppler/poppler/Dict.cc', + '../third_party/externals/poppler/poppler/Error.cc', + '../third_party/externals/poppler/poppler/FileSpec.cc', + '../third_party/externals/poppler/poppler/FontEncodingTables.cc', + '../third_party/externals/poppler/poppler/FontInfo.cc', + '../third_party/externals/poppler/poppler/Form.cc', + '../third_party/externals/poppler/poppler/Function.cc', + '../third_party/externals/poppler/poppler/Gfx.cc', + '../third_party/externals/poppler/poppler/GfxFont.cc', + '../third_party/externals/poppler/poppler/GfxState.cc', + '../third_party/externals/poppler/poppler/GlobalParams.cc', + '../third_party/externals/poppler/poppler/Hints.cc', + '../third_party/externals/poppler/poppler/JArithmeticDecoder.cc', + '../third_party/externals/poppler/poppler/JBIG2Stream.cc', + '../third_party/externals/poppler/poppler/JPXStream.cc', + '../third_party/externals/poppler/poppler/Lexer.cc', + '../third_party/externals/poppler/poppler/Linearization.cc', + '../third_party/externals/poppler/poppler/Link.cc', + '../third_party/externals/poppler/poppler/LocalPDFDocBuilder.cc', + '../third_party/externals/poppler/poppler/Movie.cc', + '../third_party/externals/poppler/poppler/NameToCharCode.cc', + '../third_party/externals/poppler/poppler/Object.cc', + '../third_party/externals/poppler/poppler/OptionalContent.cc', + '../third_party/externals/poppler/poppler/Outline.cc', + '../third_party/externals/poppler/poppler/OutputDev.cc', + '../third_party/externals/poppler/poppler/Page.cc', + '../third_party/externals/poppler/poppler/PageLabelInfo.cc', + '../third_party/externals/poppler/poppler/PageTransition.cc', + '../third_party/externals/poppler/poppler/Parser.cc', + '../third_party/externals/poppler/poppler/PDFDoc.cc', + '../third_party/externals/poppler/poppler/PDFDocEncoding.cc', + '../third_party/externals/poppler/poppler/PDFDocFactory.cc', + '../third_party/externals/poppler/poppler/PopplerCache.cc', + '../third_party/externals/poppler/poppler/PreScanOutputDev.cc', + '../third_party/externals/poppler/poppler/ProfileData.cc', + '../third_party/externals/poppler/poppler/PSOutputDev.cc', + '../third_party/externals/poppler/poppler/PSTokenizer.cc', + '../third_party/externals/poppler/poppler/Rendition.cc', + '../third_party/externals/poppler/poppler/SecurityHandler.cc', + '../third_party/externals/poppler/poppler/Sound.cc', + '../third_party/externals/poppler/poppler/SplashOutputDev.cc', + '../third_party/externals/poppler/poppler/StdinCachedFile.cc', + '../third_party/externals/poppler/poppler/StdinPDFDocBuilder.cc', + '../third_party/externals/poppler/poppler/Stream.cc', + '../third_party/externals/poppler/poppler/strtok_r.cpp', + '../third_party/externals/poppler/poppler/TextOutputDev.cc', + '../third_party/externals/poppler/poppler/UnicodeMap.cc', + '../third_party/externals/poppler/poppler/UnicodeTypeTable.cc', + '../third_party/externals/poppler/poppler/UTF.cc', + '../third_party/externals/poppler/poppler/ViewerPreferences.cc', + '../third_party/externals/poppler/poppler/XpdfPluginAPI.cc', + '../third_party/externals/poppler/poppler/XRef.cc', + '../third_party/externals/poppler/splash/Splash.cc', + '../third_party/externals/poppler/splash/SplashBitmap.cc', + '../third_party/externals/poppler/splash/SplashClip.cc', + '../third_party/externals/poppler/splash/SplashFont.cc', + '../third_party/externals/poppler/splash/SplashFontEngine.cc', + '../third_party/externals/poppler/splash/SplashFontFile.cc', + '../third_party/externals/poppler/splash/SplashFontFileID.cc', + '../third_party/externals/poppler/splash/SplashFTFont.cc', + '../third_party/externals/poppler/splash/SplashFTFontEngine.cc', + '../third_party/externals/poppler/splash/SplashFTFontFile.cc', + '../third_party/externals/poppler/splash/SplashPath.cc', + '../third_party/externals/poppler/splash/SplashPattern.cc', + '../third_party/externals/poppler/splash/SplashScreen.cc', + '../third_party/externals/poppler/splash/SplashState.cc', + '../third_party/externals/poppler/splash/SplashT1Font.cc', + '../third_party/externals/poppler/splash/SplashT1FontEngine.cc', + '../third_party/externals/poppler/splash/SplashT1FontFile.cc', + '../third_party/externals/poppler/splash/SplashXPath.cc', + '../third_party/externals/poppler/splash/SplashXPathScanner.cc', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/poppler/poppler', + ], + }, + 'cflags': [ + '-w' + ], + 'cflags_cc!': [ + '-fno-rtti' + ], + 'conditions': [ + ['skia_os == "linux"', { + 'include_dirs': [ + '../third_party/poppler/config/linux', + '/usr/include/freetype2', + ], + 'cflags': [ + '-fPIC', + ], + }], + ['skia_os in ["mac", "win"]', { + 'dependencies': [ + 'freetype.gyp:freetype_poppler', + 'fontconfig.gyp:fontconfig', + ], + }], + ['skia_os == "mac"', { + 'include_dirs': [ + '../third_party/poppler/config/mac', + ], + }], + ['skia_os == "win"', { + 'include_dirs': [ + '../third_party/poppler/config/windows', + ], + }], + ], + }, + + { + 'target_name': 'libpoppler-cpp-gpl', + 'dependencies': [ + 'libpoppler-gpl', + ], + 'type': 'shared_library', + 'include_dirs' : [ + '../third_party/externals/poppler/cpp', + '../third_party/externals/poppler', + '../third_party/externals/poppler/poppler', + '../third_party/externals/poppler/goo', + + '../third_party/poppler/config', + ], + 'sources': [ + '../third_party/externals/poppler/cpp/PNMWriter.cc', + '../third_party/externals/poppler/cpp/poppler-document.cpp', + '../third_party/externals/poppler/cpp/poppler-embedded-file.cpp', + '../third_party/externals/poppler/cpp/poppler-font.cpp', + '../third_party/externals/poppler/cpp/poppler-global.cpp', + '../third_party/externals/poppler/cpp/poppler-image.cpp', + '../third_party/externals/poppler/cpp/poppler-page.cpp', + '../third_party/externals/poppler/cpp/poppler-page-renderer.cpp', + '../third_party/externals/poppler/cpp/poppler-page-transition.cpp', + '../third_party/externals/poppler/cpp/poppler-private.cpp', + '../third_party/externals/poppler/cpp/poppler-toc.cpp', + ], + 'defines': [ + 'poppler_cpp_EXPORTS', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/poppler/cpp', + ], + }, + 'conditions': [ + ['skia_os == "linux"', { + 'include_dirs': [ + '../third_party/poppler/config/linux', + ], + 'cflags': [ + '-fPIC', + ], + }], + ['skia_os == "mac"', { + 'include_dirs': [ + '../third_party/poppler/config/mac', + ], + 'libraries':[ + '$(SDKROOT)/usr/lib/libiconv.dylib', + '$(SDKROOT)/usr/lib/libexpat.dylib', + ], + 'xcode_settings': { + 'DYLIB_INSTALL_NAME_BASE': '@executable_path', + 'OTHER_CPLUSPLUSFLAGS!': [ + # poppler doesn't do gcc-style exports + '-fvisibility=hidden', + ], + }, + }], + ['skia_os == "win"', { + 'dependencies': [ + 'iconv.gyp:iconv', + ], + 'include_dirs': [ + '../third_party/poppler/config/windows', + ], + }], + ], + }, + ], +} @@ -26,13 +26,18 @@ '../src/ports/SkDebug_nacl.cpp', '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkDebug_win.cpp', + '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', + '../src/ports/SkFontMgr_default_gdi.cpp', + '../src/ports/SkFontMgr_default_dw.cpp', + '../src/ports/SkGlobalInitialization_default.cpp', '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_posix.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkOSFile_win.cpp', + '../src/ports/SkDiscardableMemory_none.cpp', '../src/ports/SkPurgeableMemoryBlock_none.cpp', #'../src/ports/SkThread_none.cpp', '../src/ports/SkThread_pthread.cpp', @@ -113,17 +118,6 @@ 'config/win', '../src/utils/win', ], - 'conditions': [ - [ 'skia_directwrite', { - 'sources!': [ - '../src/ports/SkFontHost_win.cpp', - ], - }, { # else !skia_directwrite - 'sources!': [ - '../src/ports/SkFontHost_win_dw.cpp', - ], - }], - ], 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', '../src/ports/SkOSFile_posix.cpp', @@ -131,11 +125,25 @@ '../src/ports/SkTime_Unix.cpp', '../src/ports/SkTLS_pthread.cpp', ], + 'conditions': [ + # when we build for win, we only want one of these default files + [ 'skia_directwrite', { + 'sources!': [ + '../src/ports/SkFontMgr_default_gdi.cpp', + ], + }, { # else gdi + 'sources!': [ + '../src/ports/SkFontMgr_default_dw.cpp', + ], + }], + ], }, { # else !win 'sources!': [ '../src/ports/SkDebug_win.cpp', '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', + '../src/ports/SkFontMgr_default_gdi.cpp', + '../src/ports/SkFontMgr_default_dw.cpp', '../src/ports/SkOSFile_win.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', diff --git a/public_headers.gypi b/public_headers.gypi new file mode 100644 index 0000000..d563d84 --- /dev/null +++ b/public_headers.gypi @@ -0,0 +1,312 @@ +# Include this gypi to include all public header files that exist in the +# include directory. +# +# The list is computed by running 'find include -name *.h' in the root dir of +# the project. +# +{ + 'variables': { + 'header_filenames': [ + 'pdf/SkPDFDevice.h', + 'pdf/SkPDFDocument.h', + 'svg/SkSVGTypes.h', + 'svg/SkSVGBase.h', + 'svg/SkSVGAttribute.h', + 'svg/SkSVGParser.h', + 'svg/SkSVGPaintState.h', + 'animator/SkAnimator.h', + 'animator/SkAnimatorView.h', + 'gpu/GrTexture.h', + 'gpu/SkGr.h', + 'gpu/GrContext.h', + 'gpu/gl/GrGLConfig_chrome.h', + 'gpu/gl/SkNativeGLContext.h', + 'gpu/gl/SkMesaGLContext.h', + 'gpu/gl/SkDebugGLContext.h', + 'gpu/gl/SkANGLEGLContext.h', + 'gpu/gl/GrGLConfig.h', + 'gpu/gl/GrGLInterface.h', + 'gpu/gl/SkNullGLContext.h', + 'gpu/gl/GrGLFunctions.h', + 'gpu/gl/SkGLContextHelper.h', + 'gpu/gl/GrGLExtensions.h', + 'gpu/SkGpuDevice.h', + 'gpu/GrTypes.h', + 'gpu/GrFontScaler.h', + 'gpu/GrResource.h', + 'gpu/GrKey.h', + 'gpu/GrOvalRenderer.h', + 'gpu/GrEffectUnitTest.h', + 'gpu/GrConfig.h', + 'gpu/GrPaint.h', + 'gpu/GrPathRendererChain.h', + 'gpu/GrTBackendEffectFactory.h', + 'gpu/GrDrawEffect.h', + 'gpu/GrTextContext.h', + 'gpu/GrEffect.h', + 'gpu/SkGrTexturePixelRef.h', + 'gpu/GrTextureAccess.h', + 'gpu/GrRect.h', + 'gpu/GrEffectStage.h', + 'gpu/GrClipData.h', + 'gpu/GrUserConfig.h', + 'gpu/SkGrPixelRef.h', + 'gpu/GrAARectRenderer.h', + 'gpu/GrColor.h', + 'gpu/GrGlyph.h', + 'gpu/GrBackendEffectFactory.h', + 'gpu/GrContextFactory.h', + 'gpu/GrRenderTarget.h', + 'gpu/GrSurface.h', + 'gpu/GrTypesPriv.h', + 'gpu/GrPoint.h', + 'config/sk_stdint.h', + 'config/SkUserConfig.h', + 'pipe/SkGPipe.h', + 'images/SkImageRef.h', + 'images/SkMovie.h', + 'images/SkPageFlipper.h', + 'images/SkForceLinking.h', + 'images/SkImageRef_GlobalPool.h', + 'images/SkImages.h', + 'effects/SkMorphologyImageFilter.h', + 'effects/Sk2DPathEffect.h', + 'effects/SkXfermodeImageFilter.h', + 'effects/SkArithmeticMode.h', + 'effects/SkMergeImageFilter.h', + 'effects/SkPerlinNoiseShader.h', + 'effects/SkLerpXfermode.h', + 'effects/SkLumaColorFilter.h', + 'effects/SkRectShaderImageFilter.h', + 'effects/SkMagnifierImageFilter.h', + 'effects/SkBicubicImageFilter.h', + 'effects/SkPorterDuff.h', + 'effects/SkBlurImageFilter.h', + 'effects/SkKernel33MaskFilter.h', + 'effects/SkTableMaskFilter.h', + 'effects/SkAvoidXfermode.h', + 'effects/SkBitmapSource.h', + 'effects/SkCornerPathEffect.h', + 'effects/SkTransparentShader.h', + 'effects/SkStippleMaskFilter.h', + 'effects/SkPaintFlagsDrawFilter.h', + 'effects/SkOffsetImageFilter.h', + 'effects/SkDiscretePathEffect.h', + 'effects/SkTableColorFilter.h', + 'effects/SkGradientShader.h', + 'effects/SkEmbossMaskFilter.h', + 'effects/SkComposeImageFilter.h', + 'effects/SkTestImageFilters.h', + 'effects/SkLayerRasterizer.h', + 'effects/SkDashPathEffect.h', + 'effects/Sk1DPathEffect.h', + 'effects/SkBlurMaskFilter.h', + 'effects/SkDrawExtraPathEffect.h', + 'effects/SkDisplacementMapEffect.h', + 'effects/SkPixelXorXfermode.h', + 'effects/SkColorMatrixFilter.h', + 'effects/SkColorMatrix.h', + 'effects/SkBlurDrawLooper.h', + 'effects/SkColorFilterImageFilter.h', + 'effects/SkLayerDrawLooper.h', + 'effects/SkLightingImageFilter.h', + 'effects/SkDropShadowImageFilter.h', + 'effects/SkMatrixConvolutionImageFilter.h', + 'utils/win/SkAutoCoInitialize.h', + 'utils/win/SkHRESULT.h', + 'utils/win/SkIStream.h', + 'utils/win/SkTScopedComPtr.h', + 'utils/SkBoundaryPatch.h', + 'utils/SkUnitMappers.h', + 'utils/SkPictureUtils.h', + 'utils/SkRandom.h', + 'utils/SkMeshUtils.h', + 'utils/SkCullPoints.h', + 'utils/SkCamera.h', + 'utils/SkLua.h', + 'utils/SkParsePaint.h', + 'utils/SkCountdown.h', + 'utils/SkRunnable.h', + 'utils/SkParse.h', + 'utils/SkThreadPool.h', + 'utils/SkMatrix44.h', + 'utils/SkInterpolator.h', + 'utils/SkWGL.h', + 'utils/SkDumpCanvas.h', + 'utils/SkRTConf.h', + 'utils/SkCubicInterval.h', + 'utils/SkLuaCanvas.h', + 'utils/SkDebugUtils.h', + 'utils/SkLayer.h', + 'utils/SkProxyCanvas.h', + 'utils/SkNWayCanvas.h', + 'utils/SkPathUtils.h', + 'utils/SkDeferredCanvas.h', + 'utils/ios/SkStream_NSData.h', + 'utils/SkNullCanvas.h', + 'utils/SkParsePath.h', + 'utils/SkJSON.h', + 'utils/SkCondVar.h', + 'utils/SkNinePatch.h', + 'utils/mac/SkCGUtils.h', + 'xml/SkDOM.h', + 'xml/SkJS.h', + 'xml/SkXMLParser.h', + 'xml/SkBML_XMLParser.h', + 'xml/SkBML_WXMLParser.h', + 'xml/SkXMLWriter.h', + 'device/xps/SkXPSDevice.h', + 'device/xps/SkConstexprMath.h', + 'ports/SkTypeface_win.h', + 'ports/SkHarfBuzzFont.h', + 'ports/SkFontConfigInterface.h', + 'ports/SkTypeface_mac.h', + 'ports/SkTypeface_android.h', + 'ports/SkFontStyle.h', + 'ports/SkFontMgr.h', + 'text/SkTextLayout.h', + 'core/SkColor.h', + 'core/SkFontHost.h', + 'core/SkMetaData.h', + 'core/SkRRect.h', + 'core/SkMatrix.h', + 'core/SkDataTable.h', + 'core/SkScalar.h', + 'core/SkFlattenableSerialization.h', + 'core/SkTypeface.h', + 'core/SkImageEncoder.h', + 'core/SkDrawFilter.h', + 'core/SkTDict.h', + 'core/SkRasterizer.h', + 'core/SkColorPriv.h', + 'core/SkFloatingPoint.h', + 'core/SkOSFile.h', + 'core/SkPaint.h', + 'core/SkTDStack.h', + 'core/SkDither.h', + 'core/SkFixed.h', + 'core/SkDocument.h', + 'core/SkInstCnt.h', + 'core/SkEndian.h', + 'core/SkColorTable.h', + 'core/SkBitmap.h', + 'core/SkDraw.h', + 'core/SkPackBits.h', + 'core/SkFloatBits.h', + 'core/SkDeque.h', + 'core/SkTRegistry.h', + 'core/Sk64.h', + 'core/SkTLazy.h', + 'core/SkComposeShader.h', + 'core/SkUtils.h', + 'core/SkImage.h', + 'core/SkTileGridPicture.h', + 'core/SkPaintOptionsAndroid.h', + 'core/SkDeviceProperties.h', + 'core/SkGraphics.h', + 'core/SkCanvas.h', + 'core/SkPicture.h', + 'core/SkClipStack.h', + 'core/SkXfermode.h', + 'core/SkColorFilter.h', + 'core/SkRegion.h', + 'core/SkRefCnt.h', + 'core/SkStream.h', + 'core/SkFontLCDConfig.h', + 'core/SkBlitRow.h', + 'core/SkGeometry.h', + 'core/SkStrokeRec.h', + 'core/SkImageDecoder.h', + 'core/SkTime.h', + 'core/SkScalarCompare.h', + 'core/SkPathMeasure.h', + 'core/SkMaskFilter.h', + 'core/SkBounder.h', + 'core/SkFlate.h', + 'core/SkTDArray.h', + 'core/SkAnnotation.h', + 'core/SkChecksum.h', + 'core/SkMath.h', + 'core/SkDrawLooper.h', + 'core/SkThread_platform.h', + 'core/SkFlattenableBuffers.h', + 'core/SkTemplates.h', + 'core/SkMask.h', + 'core/SkMallocPixelRef.h', + 'core/SkWeakRefCnt.h', + 'core/SkTypes.h', + 'core/SkThread.h', + 'core/SkData.h', + 'core/SkPoint.h', + 'core/SkColorShader.h', + 'core/SkChunkAlloc.h', + 'core/SkUnPreMultiply.h', + 'core/SkReader32.h', + 'core/SkDevice.h', + 'core/SkImageFilter.h', + 'core/SkAdvancedTypefaceMetrics.h', + 'core/SkTInternalLList.h', + 'core/SkTArray.h', + 'core/SkStringUtils.h', + 'core/SkPreConfig.h', + 'core/SkImageFilterUtils.h', + 'core/SkLineClipper.h', + 'core/SkPathEffect.h', + 'core/SkString.h', + 'core/SkPixelRef.h', + 'core/SkSize.h', + 'core/SkEmptyShader.h', + 'core/SkSurface.h', + 'core/SkPostConfig.h', + 'core/SkShader.h', + 'core/SkWriter32.h', + 'core/SkError.h', + 'core/SkPath.h', + 'core/SkTrace.h', + 'core/SkUnitMapper.h', + 'core/SkFlattenable.h', + 'core/SkTSearch.h', + 'core/SkRect.h', + 'pathops/SkPathOps.h', + 'views/SkTouchGesture.h', + 'views/SkEvent.h', + 'views/SkOSWindow_NaCl.h', + 'views/SkTextBox.h', + 'views/SkViewInflate.h', + 'views/SkOSWindow_iOS.h', + 'views/SkBGViewArtist.h', + 'views/SkOSWindow_SDL.h', + 'views/SkWindow.h', + 'views/SkSystemEventTypes.h', + 'views/SkOSWindow_Android.h', + 'views/SkOSWindow_Mac.h', + 'views/android/AndroidKeyToSkKey.h', + 'views/SkEventSink.h', + 'views/animated/SkImageView.h', + 'views/animated/SkWidgetViews.h', + 'views/animated/SkProgressBarView.h', + 'views/animated/SkBorderView.h', + 'views/animated/SkScrollBarView.h', + 'views/SkStackViewLayout.h', + 'views/SkApplication.h', + 'views/unix/keysym2ucs.h', + 'views/unix/XkeysToSkKeys.h', + 'views/SkKey.h', + 'views/SkView.h', + 'views/SkOSMenu.h', + '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: diff --git a/skpskgr_test.gyp b/skpskgr_test.gyp new file mode 100755 index 0000000..3a5e4d1 --- /dev/null +++ b/skpskgr_test.gyp @@ -0,0 +1,46 @@ +# GYP file to build unit tests. +{ + 'includes': [ + 'apptype_console.gypi', + ], + 'targets': [ + { + 'target_name': 'skpskgr_test', + 'type': 'executable', + 'suppress_wildcard': '1', + 'include_dirs' : [ + '../src/core', + '../src/effects', + '../src/lazy', + '../src/pathops', + '../src/pdf', + '../src/pipe/utils', + '../src/utils', + '../tools/', + ], + 'sources': [ + '../tests/SkpSkGrTest.cpp', + '../tests/Test.cpp', + '../tests/skia_test.cpp', + '../tests/Test.h', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + 'flags.gyp:flags', + ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'include_dirs': [ + '../src/gpu', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: @@ -10,18 +10,25 @@ 'include_dirs' : [ '../src/core', '../src/effects', + '../src/image', '../src/lazy', + '../src/images', '../src/pathops', '../src/pdf', '../src/pipe/utils', '../src/utils', '../tools/', + + # Needed for TDStackNesterTest. + '../experimental/PdfViewer', + '../experimental/PdfViewer/src', ], 'includes': [ 'pathops_unittest.gypi', ], 'sources': [ '../tests/AAClipTest.cpp', + '../tests/AndroidPaintTest.cpp', '../tests/AnnotationTest.cpp', '../tests/ARGBImageEncoderTest.cpp', '../tests/AtomicTest.cpp', @@ -33,7 +40,9 @@ '../tests/BitSetTest.cpp', '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', + '../tests/CachedDecodingPixelRefTest.cpp', '../tests/CanvasTest.cpp', + '../tests/CanvasStateTest.cpp', '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', @@ -45,6 +54,8 @@ '../tests/DataRefTest.cpp', '../tests/DeferredCanvasTest.cpp', '../tests/DequeTest.cpp', + '../tests/DeviceLooperTest.cpp', + '../tests/DocumentTest.cpp', '../tests/DrawBitmapRectTest.cpp', '../tests/DrawPathTest.cpp', '../tests/DrawTextTest.cpp', @@ -59,12 +70,16 @@ '../tests/FontHostTest.cpp', '../tests/FontMgrTest.cpp', '../tests/FontNamesTest.cpp', + '../tests/FrontBufferedStreamTest.cpp', '../tests/GeometryTest.cpp', + '../tests/GifTest.cpp', '../tests/GLInterfaceValidation.cpp', '../tests/GLProgramsTest.cpp', '../tests/GpuBitmapCopyTest.cpp', + '../tests/GpuColorFilterTest.cpp', '../tests/GpuDrawPathTest.cpp', '../tests/GrContextFactoryTest.cpp', + '../tests/GrDrawTargetTest.cpp', '../tests/GradientTest.cpp', '../tests/GrMemoryPoolTest.cpp', '../tests/GrSurfaceTest.cpp', @@ -73,15 +88,19 @@ '../tests/ImageDecodingTest.cpp', '../tests/ImageFilterTest.cpp', '../tests/InfRectTest.cpp', + '../tests/JpegTest.cpp', '../tests/LListTest.cpp', '../tests/LayerDrawLooperTest.cpp', '../tests/MD5Test.cpp', '../tests/MathTest.cpp', '../tests/MatrixTest.cpp', '../tests/Matrix44Test.cpp', + '../tests/MemoryTest.cpp', '../tests/MemsetTest.cpp', + '../tests/MessageBusTest.cpp', '../tests/MetaDataTest.cpp', '../tests/MipMapTest.cpp', + '../tests/OnceTest.cpp', '../tests/OSPathTest.cpp', '../tests/PackBitsTest.cpp', '../tests/PaintTest.cpp', @@ -94,6 +113,7 @@ '../tests/PictureTest.cpp', '../tests/PictureUtilsTest.cpp', '../tests/PipeTest.cpp', + '../tests/PixelRefTest.cpp', '../tests/PointTest.cpp', '../tests/PremulAlphaRoundTripTest.cpp', '../tests/QuickRejectTest.cpp', @@ -104,10 +124,13 @@ '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', + '../tests/ResourceCacheTest.cpp', '../tests/RoundRectTest.cpp', + '../tests/RuntimeConfigTest.cpp', '../tests/RTreeTest.cpp', '../tests/SHA1Test.cpp', '../tests/ScalarTest.cpp', + '../tests/SerializationTest.cpp', '../tests/ShaderImageFilterTest.cpp', '../tests/ShaderOpacityTest.cpp', '../tests/Sk64Test.cpp', @@ -125,13 +148,18 @@ '../tests/TLSTest.cpp', '../tests/TSetTest.cpp', '../tests/ToUnicode.cpp', + '../tests/Typeface.cpp', '../tests/UnicodeTest.cpp', + '../tests/UnitTestTest.cpp', '../tests/UtilsTest.cpp', '../tests/WArrayTest.cpp', '../tests/WritePixelsTest.cpp', '../tests/Writer32Test.cpp', '../tests/XfermodeTest.cpp', + '../experimental/PdfViewer/src/SkTDStackNester.h', + '../tests/TDStackNesterTest.cpp', + # Needed for PipeTest. '../src/pipe/utils/SamplePipeControllers.cpp', ], @@ -148,16 +176,6 @@ '../src/gpu', ], }], - [ 'skia_os == "nacl"', { - # CityHash is not supported on NaCl because the NaCl toolchain is - # missing byteswap.h which is needed by CityHash. - # TODO(borenet): Find a way to either provide this dependency or - # replace it. - 'sources!': [ - '../tests/BitmapHasherTest.cpp', - '../tests/ChecksumTest.cpp', - ], - }], ], }, ], @@ -25,6 +25,7 @@ 'skpdiff', 'skhello', 'skimage', + 'test_image_decoder', ], 'conditions': [ ['skia_shared_lib', @@ -64,7 +65,8 @@ '../tools/flags/SkCommandLineFlags.cpp', ], 'include_dirs': [ - '../tools/flags' + '../tools/flags', + '../src/core/', # needed for SkTLList.h ], 'dependencies': [ 'skia_lib.gyp:skia_lib', @@ -401,6 +403,16 @@ 'tools.gyp:picture_utils', ], }, + { + 'target_name': 'test_image_decoder', + 'type': 'executable', + 'sources': [ + '../tools/test_image_decoder.cpp', + ], + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], + }, ], 'conditions': [ ['skia_shared_lib', @@ -34,7 +34,9 @@ '../src/utils/SkThreadPool.cpp', '../include/utils/SkBoundaryPatch.h', + '../include/utils/SkFrontBufferedStream.h', '../include/utils/SkCamera.h', + '../include/utils/SkCanvasStateUtils.h', '../include/utils/SkCubicInterval.h', '../include/utils/SkCullPoints.h', '../include/utils/SkDebugUtils.h', @@ -64,7 +66,11 @@ '../src/utils/SkBitSet.cpp', '../src/utils/SkBitSet.h', '../src/utils/SkBoundaryPatch.cpp', + '../src/utils/SkFrontBufferedStream.cpp', '../src/utils/SkCamera.cpp', + '../src/utils/SkCanvasStack.h', + '../src/utils/SkCanvasStack.cpp', + '../src/utils/SkCanvasStateUtils.cpp', '../src/utils/SkCubicInterval.cpp', '../src/utils/SkCullPoints.cpp', '../src/utils/SkDeferredCanvas.cpp', @@ -208,6 +214,11 @@ '../src/utils/android/ashmem.cpp', ], }], + ['skia_run_pdfviewer_in_gm', { + 'defines': [ + 'SK_BUILD_NATIVE_PDF_RENDERER', + ], + }], ], 'direct_dependent_settings': { 'include_dirs': [ |