Roll clang for Windows to chromium's current.
This is mostly to pick up new warnings before chromium complains about
them.
Change-Id: I69a0c3da63398f98d3f45b0993ed3325c0edae27
Reviewed-on: https://skia-review.googlesource.com/127395
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/assets/clang_win/VERSION b/infra/bots/assets/clang_win/VERSION
index 7813681..62f9457 100644
--- a/infra/bots/assets/clang_win/VERSION
+++ b/infra/bots/assets/clang_win/VERSION
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/infra/bots/assets/clang_win/create.py b/infra/bots/assets/clang_win/create.py
index da34ad5..b5a44e3 100755
--- a/infra/bots/assets/clang_win/create.py
+++ b/infra/bots/assets/clang_win/create.py
@@ -18,7 +18,7 @@
# Copied from CLANG_REVISION here:
# https://cs.chromium.org/chromium/src/tools/clang/scripts/update.py
-CLANG_REVISION = '327688'
+CLANG_REVISION = '331747'
CLANG_SUB_REVISION = '1'
CLANG_PKG_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
GS_URL = ('https://commondatastorage.googleapis.com/chromium-browser-clang'
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a396cdc..a27d4b8 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -14131,7 +14131,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14263,7 +14263,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14395,7 +14395,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14527,7 +14527,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14659,7 +14659,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14791,7 +14791,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -14923,7 +14923,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -15056,7 +15056,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -15188,7 +15188,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -15320,7 +15320,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
@@ -15452,7 +15452,7 @@
{
"name": "skia/bots/clang_win",
"path": "clang_win",
- "version": "version:5"
+ "version": "version:6"
}
],
"command": [
diff --git a/src/core/SkColorSpace_XYZ.cpp b/src/core/SkColorSpace_XYZ.cpp
index 968f01d..6e5c7d8 100644
--- a/src/core/SkColorSpace_XYZ.cpp
+++ b/src/core/SkColorSpace_XYZ.cpp
@@ -127,5 +127,5 @@
auto cs = sk_make_sp<SkColorSpace_XYZ>(fGammaNamed, fGammas, fToXYZD50, fProfileData);
cs->fNonlinearBlending = true;
- return cs;
+ return std::move(cs);
}
