From 9bab87b512f8efcae5d82d1ba97eb6e7f13d62ee Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 6 Aug 2014 19:35:28 +0000 Subject: [PATCH] Skia roll 41ebbdd:be21e34 https://skia.googlesource.com/skia/+log/41ebbddd76b747d5fb32c02dda0de3d03a3edda5..be21e3432e4cf925fe494efe23edcb457bd05fcb CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_layout_rel TBR=bungeman@google.com BUG= Review URL: https://codereview.chromium.org/445073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287829 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- skia/BUILD.gn | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index f6e6f2d9cba5..f4ef06a90fd4 100644 --- a/DEPS +++ b/DEPS @@ -46,7 +46,7 @@ vars = { "lss_revision": "31", "sfntly_revision": "239", "lighttpd_revision": "33737", - "skia_revision": "41ebbddd76b747d5fb32c02dda0de3d03a3edda5", + "skia_revision": "be21e3432e4cf925fe494efe23edcb457bd05fcb", # 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/BUILD.gn b/skia/BUILD.gn index 40ef810ada07..3af03facf4a5 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -324,9 +324,9 @@ component("skia") { # Remove unused util files include in utils.gypi sources -= [ - "//third_party/skia/include/utils/SkCondVar.h", - "//third_party/skia/include/utils/SkRunnable.h", - "//third_party/skia/include/utils/SkThreadPool.h", + "//third_party/skia/src/utils/SkCondVar.h", + "//third_party/skia/src/utils/SkRunnable.h", + "//third_party/skia/src/utils/SkThreadPool.h", "//third_party/skia/src/utils/SkCondVar.cpp", "//third_party/skia/include/utils/SkBoundaryPatch.h",