diff options
| author |  caryclark <caryclark@google.com> | 2014-06-24 07:55:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-24 07:55:12 -0700 |
| commit | a8d2ffb1c2e245ae06bdd1c20f34995ab8311cf6 (patch) | |
| tree | 984b13bc13e5295edf0173b0d61adb630cb4f053 /gyp | |
| parent | 9ea53f93e79ba312c4b3943923450a8b4aa57c82 (diff) | |
add pathops tight bounds; conform path ops' gyp to unit tests
Implement path tight bounds using path ops machinery. This is not
as efficient as it could be; for instance, internally, it creates
a path ops structure more suited to intersection. If this shows
up as a performance bottleneck, it could be improved.
Fix path ops gyp files, which have fallen out of sync with other
tests.
R=mtklein@google.com, bsalomon@google.com
TBR=mtklein
BUG=skia:1712
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/348343002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/pathops_unittest.gyp | 28 | ||||
| -rw-r--r-- | gyp/pathops_unittest.gypi | 18 |
3 files changed, 30 insertions, 17 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index e1bdbd5289..b4784bba59 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -340,6 +340,7 @@ '<(skia_src_path)/pathops/SkPathOpsQuad.cpp', '<(skia_src_path)/pathops/SkPathOpsRect.cpp', '<(skia_src_path)/pathops/SkPathOpsSimplify.cpp', + '<(skia_src_path)/pathops/SkPathOpsTightBounds.cpp', '<(skia_src_path)/pathops/SkPathOpsTriangle.cpp', '<(skia_src_path)/pathops/SkPathOpsTypes.cpp', '<(skia_src_path)/pathops/SkPathWriter.cpp', diff --git a/gyp/pathops_unittest.gyp b/gyp/pathops_unittest.gyp index 9803db9382..190b4f3816 100644 --- a/gyp/pathops_unittest.gyp +++ b/gyp/pathops_unittest.gyp @@ -1,4 +1,4 @@ -# GYP file to build unit tests. +# GYP file to build pathops unit tests. { 'includes': [ 'apptype_console.gypi', @@ -7,34 +7,28 @@ { 'target_name': 'pathops_unittest', 'type': 'executable', - 'suppress_wildcard': '1', - 'include_dirs' : [ - '../src/core', - '../src/effects', - '../src/lazy', - '../src/pathops', - '../src/pdf', - '../src/pipe/utils', - '../src/utils', - ], 'includes': [ 'pathops_unittest.gypi', ], + 'dependencies': [ 'tools.gyp:crash_handler' ], 'sources': [ '../tests/PathOpsAngleIdeas.cpp', '../tests/PathOpsCubicLineIntersectionIdeas.cpp', '../tests/PathOpsDebug.cpp', '../tests/PathOpsOpLoopThreadedTest.cpp', '../tests/PathOpsSkpClipTest.cpp', - '../tests/Test.cpp', - '../tests/Test.h', '../tests/skia_test.cpp', ], - 'dependencies': [ - 'flags.gyp:flags', - 'skia_lib.gyp:skia_lib', - ], 'conditions': [ + [ 'skia_android_framework == 1', { + 'libraries': [ + '-lskia', + ], + 'libraries!': [ + '-lz', + '-llog', + ], + }], [ 'skia_gpu == 1', { 'include_dirs': [ '../src/gpu', diff --git a/gyp/pathops_unittest.gypi b/gyp/pathops_unittest.gypi index e9f40d6406..9e070ab761 100644 --- a/gyp/pathops_unittest.gypi +++ b/gyp/pathops_unittest.gypi @@ -1,5 +1,22 @@ +# Common gypi for pathops unit tests. { + 'include_dirs': [ + '../src/core', + '../src/effects', + '../src/lazy', + '../src/pathops', + '../src/pipe/utils', + '../src/utils', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + 'tools.gyp:resources', + ], 'sources': [ + '../tests/Test.cpp', + '../tests/Test.h', + '../tests/PathOpsAngleTest.cpp', '../tests/PathOpsBoundsTest.cpp', '../tests/PathOpsCubicIntersectionTest.cpp', @@ -38,6 +55,7 @@ '../tests/PathOpsSkpTest.cpp', '../tests/PathOpsTestCommon.cpp', '../tests/PathOpsThreadedCommon.cpp', + '../tests/PathOpsTightBoundsTest.cpp', '../tests/PathOpsCubicIntersectionTestData.h', '../tests/PathOpsExtendedTest.h', '../tests/PathOpsQuadIntersectionTestData.h', |