aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-24 15:43:50 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-24 15:43:50 +0000
commit0ded88d431a1872e21986984f009db2e84f52738 (patch)
tree31050e07a32353fcbd687ee79c6b8b051baf7961 /gyp
parent94ecb66c4920018c833d8bbbbb8b51d18e1c5d56 (diff)
[Reland of r13154, since the Housekeeping bot seems to have reverted it in r13155. Next time I'll put the "do not disturb" sign on my commit.]
Refactor SkMorphologyImageFilter, CPU and GPU paths. This required making opts/ dependent on effects/, so that we could use the SkMorphologyProc type in SkMorphologyImageFilter.h. Correctness and performance covered by existing tests; no change in functionality. R=bsalomon@google.com, djsollen@google.com, reed@google.com Committed: https://code.google.com/p/skia/source/detail?r=13154 BUG=skia: Review URL: https://codereview.chromium.org/135013004 git-svn-id: http://skia.googlecode.com/svn/trunk@13168 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/opts.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index bd072cb1e8..9c6376671b 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -25,6 +25,7 @@
'standalone_static_library': 1,
'dependencies': [
'core.gyp:*',
+ 'effects.gyp:*'
],
'include_dirs': [
'../src/core',
@@ -121,6 +122,7 @@
'standalone_static_library': 1,
'dependencies': [
'core.gyp:*',
+ 'effects.gyp:*'
],
'include_dirs': [
'../src/core',
@@ -150,6 +152,7 @@
'standalone_static_library': 1,
'dependencies': [
'core.gyp:*',
+ 'effects.gyp:*'
],
'include_dirs': [
'../src/core',