summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-04 17:08:42 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-04 17:08:42 +0000
commita410cffcaeb6cdf182a726726f391f2a7a7901ba (patch)
treee076c5ffe4cfb335bb0631a47f96e58b6b6ce930 /skia
parent2ba0633ae603293498cfd0dadb1b3972f70b7cc2 (diff)
downloadchromium_src-a410cffcaeb6cdf182a726726f391f2a7a7901ba.zip
chromium_src-a410cffcaeb6cdf182a726726f391f2a7a7901ba.tar.gz
chromium_src-a410cffcaeb6cdf182a726726f391f2a7a7901ba.tar.bz2
Roll Skia to r4138.
Control your roll: https://chromiumcodereview.appspot.com/9252024 Review URL: https://chromiumcodereview.appspot.com/10466003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 0cdcc38..5b618f1 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -422,6 +422,8 @@
'../third_party/skia/src/gpu/effects/GrConvolutionEffect.h',
'../third_party/skia/src/gpu/effects/GrMorphologyEffect.cpp',
'../third_party/skia/src/gpu/effects/GrMorphologyEffect.h',
+ '../third_party/skia/src/gpu/effects/GrGradientEffects.cpp',
+ '../third_party/skia/src/gpu/effects/GrGradientEffects.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',
@@ -505,6 +507,8 @@
'../third_party/skia/src/pdf/SkPDFUtils.h',
'../third_party/skia/src/ports/FontHostConfiguration_android.cpp',
+ '../third_party/skia/src/ports/SkFontDescriptor.cpp',
+ '../third_party/skia/src/ports/SkFontDescriptor.h',
#'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp',
'../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
'../third_party/skia/src/ports/SkFontHost_android.cpp',