summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 14:40:52 +0000
committerbsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 14:40:52 +0000
commit84d7727f9be334754c5dac9b2e29827e18e06481 (patch)
tree88969d0f756f0abb4433295216bbbd9d1ec9d47b
parent64cdc52c255d29410fcdaf08de1a16b59568fbfe (diff)
downloadchromium_src-84d7727f9be334754c5dac9b2e29827e18e06481.zip
chromium_src-84d7727f9be334754c5dac9b2e29827e18e06481.tar.gz
chromium_src-84d7727f9be334754c5dac9b2e29827e18e06481.tar.bz2
Roll skia to r2681.
Review URL: http://codereview.chromium.org/8565022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110080 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp2
2 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index a9f84ca..e413c02 100644
--- a/DEPS
+++ b/DEPS
@@ -28,7 +28,7 @@ vars = {
"libvpx_revision": "109236",
"ffmpeg_revision": "109946",
"sfntly_revision": "98",
- "skia_revision": "2674",
+ "skia_revision": "2681",
"v8_revision": "9989",
"webrtc_revision": "946",
"jsoncpp_revision": "246",
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 578b87b..1570aca 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -379,8 +379,6 @@
'../third_party/skia/src/gpu/GrGpuFactory.cpp',
'../third_party/skia/src/gpu/GrGpuGL.cpp',
'../third_party/skia/src/gpu/GrGpuGL.h',
- '../third_party/skia/src/gpu/GrGpuGLFixed.cpp',
- '../third_party/skia/src/gpu/GrGpuGLFixed.h',
'../third_party/skia/src/gpu/GrGpuGLShaders.cpp',
'../third_party/skia/src/gpu/GrGpuGLShaders.h',
'../third_party/skia/src/gpu/GrGpuVertex.h',