diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 15:30:20 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 15:30:20 +0000 |
| commit | b1198e5292c816b1746aebf61b7abb2ca2a60b7f (patch) | |
| tree | 8d7c0f8cd19a63e0ffdbb41e65ba5a4c303f9dd2 /skia | |
| parent | dc0a8b963024ca73d49d966ef924fed07a258710 (diff) | |
| download | chromium_src-b1198e5292c816b1746aebf61b7abb2ca2a60b7f.zip chromium_src-b1198e5292c816b1746aebf61b7abb2ca2a60b7f.tar.gz chromium_src-b1198e5292c816b1746aebf61b7abb2ca2a60b7f.tar.bz2 | |
roll skia to 3891
Review URL: https://chromiumcodereview.appspot.com/10377084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/vector_platform_device_emf_win.cc | 1 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index e088c55..e644e87 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -8,6 +8,7 @@ #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/skia_utils_win.h" +#include "third_party/skia/include/core/SkPathEffect.h" #include "third_party/skia/include/core/SkTemplates.h" #include "third_party/skia/include/core/SkUtils.h" #include "third_party/skia/include/ports/SkTypeface_win.h" diff --git a/skia/skia.gyp b/skia/skia.gyp index 08d8351..ea106f5 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -391,6 +391,8 @@ '../third_party/skia/src/gpu/GrSoftwarePathRenderer.h', '../third_party/skia/src/gpu/GrPathUtils.cpp', '../third_party/skia/src/gpu/GrPlotMgr.h', + '../third_party/skia/src/gpu/GrProgramStageFactory.cpp', + '../third_party/skia/src/gpu/GrProgramStageFactory.h', '../third_party/skia/src/gpu/GrRandom.h', '../third_party/skia/src/gpu/GrRectanizer.h', '../third_party/skia/src/gpu/GrRectanizer_fifo.cpp', @@ -419,6 +421,8 @@ '../third_party/skia/src/gpu/SkGr.cpp', '../third_party/skia/src/gpu/SkGrFontScaler.cpp', '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp', + '../third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp', + '../third_party/skia/src/gpu/effects/GrConvolutionEffect.h', '../third_party/skia/src/gpu/gl/GrGLCaps.cpp', '../third_party/skia/src/gpu/gl/GrGLCaps.h', '../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp', @@ -754,6 +758,7 @@ '../third_party/skia/include/ports', '../third_party/skia/include/utils', '../third_party/skia/src/core', + '../third_party/skia/src/gpu', '../third_party/skia/src/utils', ], 'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800], |