diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 20:28:00 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 20:28:00 +0000 |
| commit | c3fb015d06d64b5826aa8889bdbbdd1cb5a802b8 (patch) | |
| tree | 14c70b8a8314c950739db6de7cfd38df7164ef46 /skia/skia.gyp | |
| parent | 4332504927997c940b153385ad5c093995eae608 (diff) | |
| download | chromium_src-c3fb015d06d64b5826aa8889bdbbdd1cb5a802b8.zip chromium_src-c3fb015d06d64b5826aa8889bdbbdd1cb5a802b8.tar.gz chromium_src-c3fb015d06d64b5826aa8889bdbbdd1cb5a802b8.tar.bz2 | |
Skia merge 293:308
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 45e4281..6fd6d639 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -317,7 +317,6 @@ '../third_party/skia/src/effects/SkKernel33MaskFilter.cpp', '../third_party/skia/src/effects/SkLayerDrawLooper.cpp', '../third_party/skia/src/effects/SkLayerRasterizer.cpp', - '../third_party/skia/src/effects/SkNWayCanvas.cpp', '../third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp', '../third_party/skia/src/effects/SkPorterDuff.cpp', '../third_party/skia/src/effects/SkPixelXorXfermode.cpp', @@ -353,6 +352,9 @@ '../third_party/skia/src/images/SkScaledBitmapSampler.cpp', '../third_party/skia/src/images/SkScaledBitmapSampler.h', + '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', + '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', + #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', #'../third_party/skia/src/ports/SkFontHost_android.cpp', @@ -382,8 +384,8 @@ #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp', '../third_party/skia/src/ports/sk_predefined_gamma.h', - '../third_party/skia/src/include/utils/mac/SkCGUtils.h', - '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp', + '../third_party/skia/src/include/utils/mac/SkCGUtils.h', + '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp', '../third_party/skia/include/core/Sk64.h', '../third_party/skia/include/core/SkAutoKern.h', @@ -544,6 +546,7 @@ '../third_party/skia/include/effects', '../third_party/skia/include/images', '../third_party/skia/include/utils', + '../third_party/skia/src/core', ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], 'mac_framework_dirs': [ |