Skip to content

Commit f940e2f

Browse files
vladimirsamsonovtonsky
authored andcommitted
m119-fcb55886b9
1 parent c855d7f commit f940e2f

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ on:
22
push:
33
branches:
44
- master
5+
- 'm*'
56
paths:
67
- ".github/workflows/*"
78
- "script/*"
@@ -14,7 +15,7 @@ on:
1415
default: 'false'
1516

1617
env:
17-
version: m116-d2c211228d
18+
version: m119-fcb55886b9
1819

1920
jobs:
2021
macos:

patches/GrD3DUtil.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/gpu/ganesh/d3d/GrD3DUtil.h b/src/gpu/ganesh/d3d/GrD3DUtil.h
2+
index a58f6d0480..bc91283829 100644
3+
--- a/src/gpu/ganesh/d3d/GrD3DUtil.h
4+
+++ b/src/gpu/ganesh/d3d/GrD3DUtil.h
5+
@@ -8,6 +8,7 @@
6+
#ifndef GrD3DUtil_DEFINED
7+
#define GrD3DUtil_DEFINED
8+
9+
+#include <string>
10+
#include "include/core/SkImage.h"
11+
#include "include/gpu/GrTypes.h"
12+
#include "include/gpu/d3d/GrD3DTypes.h"

patches/warn_SkMatrix.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
2-
index 03140760d6..ec7cd35923 100644
2+
index 96a12f111eb5..5ffd87e13d39 100644
33
--- a/include/core/SkMatrix.h
44
+++ b/include/core/SkMatrix.h
5-
@@ -86,7 +86,7 @@ public:
5+
@@ -93,7 +93,7 @@ public:
66
return m;
77
}
88
static SkMatrix SK_WARN_UNUSED_RESULT Translate(SkVector t) { return Translate(t.x(), t.y()); }

0 commit comments

Comments
 (0)