diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:05:56 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:05:56 +0000 |
| commit | c17ec6dc0ed52d64328ed4880c3c374a9205b017 (patch) | |
| tree | 55429c276c2d07430bf8fce5d528f9138079a6cf | |
| parent | 99e5e952f0eb1dc803687c61a16ee381412acc95 (diff) | |
| download | chromium_src-c17ec6dc0ed52d64328ed4880c3c374a9205b017.zip chromium_src-c17ec6dc0ed52d64328ed4880c3c374a9205b017.tar.gz chromium_src-c17ec6dc0ed52d64328ed4880c3c374a9205b017.tar.bz2 | |
Roll Skia DEPS to r12678
R=reed@google.com, rmistry@google.com
Review URL: https://codereview.chromium.org/103343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240869 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -41,8 +41,8 @@ vars = { "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "12652", - "skia_hash": "0682019f2161af00168bb1984918753f2a1c1e54", + "skia_revision": "12678", + "skia_hash": "e132f5031fb700e34af1ea08b575b2c774393047", # 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_library.gypi b/skia/skia_library.gypi index 745133e..b957fa6 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -44,6 +44,7 @@ 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 'SK_SUPPORT_LEGACY_COLORTYPE=1', 'GR_GL_IGNORE_ES3_MSAA=0', + 'SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' ], 'default_font_cache_limit%': '(20*1024*1024)', |