Commit 9a429d1f authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Simplify render_text* conditions in GN

|use_aura| and |is_ios| is mutually exclusive, so the condition
to add render_text* and related files can be simplified a bit.

This is a followup of crrev.com/c/1144305.

Bug: None
Change-Id: I986d6347d7e87866ce0c18ea6dbbb25c49dee0d4
Reviewed-on: https://chromium-review.googlesource.com/1147092
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577483}
parent 83a1a9ed
...@@ -258,29 +258,6 @@ jumbo_component("gfx") { ...@@ -258,29 +258,6 @@ jumbo_component("gfx") {
"//third_party/zlib", "//third_party/zlib",
] ]
# Text rendering conditions (complicated so separated out).
if (use_aura || is_mac || is_android || is_fuchsia) {
# Mac doesn't use RenderTextHarfBuzz by default yet.
sources += [
"harfbuzz_font_skia.cc",
"harfbuzz_font_skia.h",
"render_text_harfbuzz.cc",
"render_text_harfbuzz.h",
"render_text_mac.h",
"render_text_mac.mm",
"text_utils_skia.cc",
]
if (!is_ios) {
sources += [
"render_text.cc",
"render_text.h",
]
}
} else {
# We don't support RenderText on these platforms.
}
if (is_android) { if (is_android) {
set_sources_assignment_filter([]) set_sources_assignment_filter([])
sources += [ sources += [
...@@ -316,8 +293,17 @@ jumbo_component("gfx") { ...@@ -316,8 +293,17 @@ jumbo_component("gfx") {
if (!is_ios) { if (!is_ios) {
sources += [ sources += [
"harfbuzz_font_skia.cc",
"harfbuzz_font_skia.h",
"paint_vector_icon.cc", "paint_vector_icon.cc",
"paint_vector_icon.h", "paint_vector_icon.h",
"render_text.cc",
"render_text.h",
"render_text_harfbuzz.cc",
"render_text_harfbuzz.h",
"render_text_mac.h",
"render_text_mac.mm",
"text_utils_skia.cc",
"vector_icon_types.h", "vector_icon_types.h",
] ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment