mojo/tools/roll/skia_build.patch - Issue 706203003: Update from https://crrev.com/303153

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: mojo/tools/roll/skia_build.patch

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 diff --git a/skia/BUILD.gn b/skia/BUILD.gn	1 diff --git a/skia/BUILD.gn b/skia/BUILD.gn

2 index 356c6ae..042d03d 100644	2 index 1944183..a57b6a1 100644

3 --- a/skia/BUILD.gn	3 --- a/skia/BUILD.gn

4 +++ b/skia/BUILD.gn	4 +++ b/skia/BUILD.gn

5 @@ -11,15 +11,6 @@ if (cpu_arch == "arm") {	5 @@ -11,15 +11,6 @@ if (cpu_arch == "arm") {

6 skia_support_gpu = !is_ios	6 skia_support_gpu = !is_ios

7 skia_support_pdf = !is_ios && printing_mode != 0	7 skia_support_pdf = !is_ios && (enable_basic_printing \|\| enable_print_preview)

8	8

9 -# The list of Skia defines that are to be set for blink.	9 -# The list of Skia defines that are to be set for blink.

10 -gypi_blink_skia_defines = exec_script(	10 -gypi_blink_skia_defines = exec_script(

11 - "//build/gypi_to_gn.py",	11 - "//build/gypi_to_gn.py",

12 - [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),	12 - [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),

13 - "--replace=<(skia_include_path)=//third_party/skia/include",	13 - "--replace=<(skia_include_path)=//third_party/skia/include",

14 - "--replace=<(skia_src_path)=//third_party/skia/src" ],	14 - "--replace=<(skia_src_path)=//third_party/skia/src" ],

15 - "scope",	15 - "scope",

16 - [ "//third_party/WebKit/public/blink_skia_config.gypi" ])	16 - [ "//third_party/WebKit/public/blink_skia_config.gypi" ])

17 -	17 -

18 # The list of Skia defines that are to be set for chromium.	18 # The list of Skia defines that are to be set for chromium.

19 gypi_skia_defines = exec_script(	19 gypi_skia_defines = exec_script(

20 "//build/gypi_to_gn.py",	20 "//build/gypi_to_gn.py",

21 @@ -107,8 +98,7 @@ config("skia_config") {	21 @@ -108,8 +99,7 @@ config("skia_config") {

22 "//third_party/skia/src/lazy",	22 "//third_party/skia/src/lazy",

23 ]	23 ]

24	24

25 - defines = gypi_blink_skia_defines.blink_skia_defines	25 - defines = gypi_blink_skia_defines.blink_skia_defines

26 - defines += gypi_skia_defines.skia_for_chromium_defines	26 - defines += gypi_skia_defines.skia_for_chromium_defines

27 + defines = gypi_skia_defines.skia_for_chromium_defines	27 + defines = gypi_skia_defines.skia_for_chromium_defines

28	28

29 defines += [	29 defines += [

30 "SK_ENABLE_INST_COUNT=0",	30 "SK_ENABLE_INST_COUNT=0",

OLD	NEW

« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | net/base/filename_util_internal.cc » ('j') | no next file with comments »