skia/skia.gyp - Issue 10441122: Roll Skia to r4102.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/skia.gyp

Issue 10441122: Roll Skia to r4102. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: skia/skia.gyp

===================================================================

--- skia/skia.gyp (revision 139833)

+++ skia/skia.gyp (working copy)

@@ -417,8 +417,11 @@

'../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/Gr1DKernelEffect.h',

'../third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp',

'../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/gl/GrGLCaps.cpp',

'../third_party/skia/src/gpu/gl/GrGLCaps.h',

'../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp',

@@ -449,8 +452,7 @@

'../third_party/skia/src/gpu/gl/GrGLVertexBuffer.h',

'../third_party/skia/src/gpu/gl/GrGpuGL.cpp',

'../third_party/skia/src/gpu/gl/GrGpuGL.h',

- '../third_party/skia/src/gpu/gl/GrGpuGLShaders.cpp',

- '../third_party/skia/src/gpu/gl/GrGpuGLShaders.h',

+ '../third_party/skia/src/gpu/gl/GrGpuGL_program.cpp',

'../third_party/skia/src/images/bmpdecoderhelper.cpp',

'../third_party/skia/src/images/bmpdecoderhelper.h',

« no previous file with comments | « DEPS ('k') | ui/gl/gl_bindings_skia_in_process.cc » ('j') | no next file with comments »