diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 16:13:42 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 16:13:42 +0000 |
| commit | e89f746ee45d7f5074506bce0b1de24ca1c75789 (patch) | |
| tree | 91ad5bf18f7ab3b912d2af9b64c4a3a26777322a | |
| parent | 93245ec83138fa8b52e7e46212b82cd7a542fa95 (diff) | |
| download | chromium_src-e89f746ee45d7f5074506bce0b1de24ca1c75789.zip chromium_src-e89f746ee45d7f5074506bce0b1de24ca1c75789.tar.gz chromium_src-e89f746ee45d7f5074506bce0b1de24ca1c75789.tar.bz2 | |
Rolling Skia DEPS to r1385 (and modifying affected gyp file)
Corresponding "control" changelist (for comparison of trybot results) is http://codereview.chromium.org/7047016 . I await results from the trybots.
It looks like a Skia change between r1365 and r1385 requires a change to skia/skia.gyp, because a previous DEPS roll try resulted in the following error in http://build.chromium.org/p/tryserver.chromium/builders/win_layout_rel/builds/236/steps/compile/logs/stdio
Review URL: http://codereview.chromium.org/7052001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86090 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -16,7 +16,7 @@ vars = { "libjingle_revision": "59", "libvpx_revision": "81610", "ffmpeg_revision": "83815", - "skia_revision": "1365", + "skia_revision": "1385", "v8_revision": "7928", } diff --git a/skia/skia.gyp b/skia/skia.gyp index 0e203ed..b158d91 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -331,6 +331,7 @@ '../third_party/skia/src/core/SkFloat.cpp', '../third_party/skia/src/core/SkFloat.h', '../third_party/skia/src/core/SkFloatBits.cpp', + '../third_party/skia/src/core/SkFontHost.cpp', '../third_party/skia/src/core/SkGeometry.cpp', '../third_party/skia/src/core/SkGlobals.cpp', '../third_party/skia/src/core/SkGlyphCache.cpp', @@ -776,7 +777,6 @@ 'ext/SkFontHost_fontconfig_direct.cpp', '../third_party/skia/src/core/SkBlitter_ARGB32_Subpixel.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_Subpixel.cpp', - '../third_party/skia/src/core/SkFontHost.cpp', ], 'defines': [ 'SK_SUPPORT_LCDTEXT', |