summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 12:35:57 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 12:35:57 +0000
commitf69726d8ffe220b2779df2893d90bb14873a6f6a (patch)
tree865068a29aad8e8881451f430ba941f732797bdc
parent4c2a6d227ace32ad682695207bf8e578ead3981d (diff)
downloadchromium_src-f69726d8ffe220b2779df2893d90bb14873a6f6a.zip
chromium_src-f69726d8ffe220b2779df2893d90bb14873a6f6a.tar.gz
chromium_src-f69726d8ffe220b2779df2893d90bb14873a6f6a.tar.bz2
Roll Skia DEPS to r9130
R=reed@google.com Review URL: https://codereview.chromium.org/15110004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200240 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 74c6a6d..dcebb3c 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "04db474e52bae0eef2cd22341aca1caf427411de",
"sfntly_revision": "134",
- "skia_revision": "9113",
+ "skia_revision": "9130",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 56f77d6..6806600 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -371,6 +371,7 @@
'-Wno-unused-function',
],
'sources': [
+ '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
'../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
'../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
],