diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 13:08:34 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 13:08:34 +0000 |
| commit | 998b35ae432f49ac2591d952206f6266ece3483f (patch) | |
| tree | 28ea66af0e11db9045fb9d26036ed3ec9d2b00ec | |
| parent | df2ae488ea8334510af95eb679b50b1327475799 (diff) | |
| download | chromium_src-998b35ae432f49ac2591d952206f6266ece3483f.zip chromium_src-998b35ae432f49ac2591d952206f6266ece3483f.tar.gz chromium_src-998b35ae432f49ac2591d952206f6266ece3483f.tar.bz2 | |
Roll Skia DEPS to r10169
R=rmistry@google.com
Review URL: https://codereview.chromium.org/19776011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212575 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 5 |
3 files changed, 1 insertions, 7 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e", "sfntly_revision": "134", - "skia_revision": "10132", + "skia_revision": "10169", # 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 c1fe1de..2432310 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -259,7 +259,6 @@ 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', 'IGNORE_ROT_AA_RECT_OPT', - 'SK_IGNORE_IMAGE_PRESCALE', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index 14d681e..559db8c 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -58,9 +58,4 @@ crbug.com/258850 svg/custom/marker-opacity.svg [ ImageOnlyFailure ] crbug.com/258850 svg/batik/text/smallFonts.svg [ ImageOnlyFailure ] crbug.com/258850 svg/batik/text/textFeatures.svg [ ImageOnlyFailure ] -# The Skia DEPS roll to r10025 introduced 1 new image difference -# due to changes to the image resizing code in r9980 -# (fix bug with awesome filtered images sometimes being slightly offset) -crbug.com/260153 virtual/deferred/fast/images/webp-color-profile-lossy.html [ ImageOnlyFailure ] - # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |