summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjunov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 17:38:55 +0000
committerjunov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 17:38:55 +0000
commitb01df17125a2273d5c685452c49162aafb582215 (patch)
treea8fa387ccb25543b64c55d6d0c0da47e635c1e09
parent8d3ffeaad240ee7b1f1549edbfefe13d4f687087 (diff)
downloadchromium_src-b01df17125a2273d5c685452c49162aafb582215.zip
chromium_src-b01df17125a2273d5c685452c49162aafb582215.tar.gz
chromium_src-b01df17125a2273d5c685452c49162aafb582215.tar.bz2
Rolling Skia DEPS from r1984 to r1994
Review URL: http://codereview.chromium.org/7523053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94706 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp7
2 files changed, 5 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index e89d394..fc1a974 100644
--- a/DEPS
+++ b/DEPS
@@ -22,7 +22,7 @@ vars = {
"libvpx_revision": "90416",
"ffmpeg_revision": "94207",
"sfntly_revision": "25",
- "skia_revision": "1984",
+ "skia_revision": "1994",
"v8_revision": "8751",
"webrtc_revision": "232",
}
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 92f4325..eb06046 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -18,12 +18,16 @@
'../third_party/skia/gpu/src/GrDrawTarget.cpp',
'../third_party/skia/gpu/src/GrGLDefaultInterface_none.cpp',
'../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
+ '../third_party/skia/gpu/src/GrGLIndexBuffer.h',
'../third_party/skia/gpu/src/GrGLInterface.cpp',
+ '../third_party/skia/gpu/src/GrGLIRect.h',
'../third_party/skia/gpu/src/GrGLProgram.cpp',
'../third_party/skia/gpu/src/GrGLProgram.h',
'../third_party/skia/gpu/src/GrGLTexture.cpp',
+ '../third_party/skia/gpu/src/GrGLTexture.h',
'../third_party/skia/gpu/src/GrGLUtil.cpp',
'../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
+ '../third_party/skia/gpu/src/GrGLVertexBuffer.h',
'../third_party/skia/gpu/src/GrGpu.cpp',
'../third_party/skia/gpu/src/GrGpuFactory.cpp',
'../third_party/skia/gpu/src/GrGpuGL.cpp',
@@ -61,10 +65,7 @@
'../third_party/skia/gpu/include/GrGeometryBuffer.h',
'../third_party/skia/gpu/include/GrGLConfig.h',
'../third_party/skia/gpu/include/GrGLConfig_chrome.h',
- '../third_party/skia/gpu/include/GrGLIndexBuffer.h',
'../third_party/skia/gpu/include/GrGLInterface.h',
- '../third_party/skia/gpu/include/GrGLTexture.h',
- '../third_party/skia/gpu/include/GrGLVertexBuffer.h',
'../third_party/skia/gpu/include/GrGlyph.h',
'../third_party/skia/gpu/include/GrGpu.h',
'../third_party/skia/gpu/include/GrGpuVertex.h',