Commit 88362923 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

Ozone/Linux: use pangocairo and fix *TrueTypeFont tests

This fixes *TrueTypeFont tests. Maybe, we want to use something
else than pangocairo. A bug to track that has been created.

PS: it's important to fix this now as long as use_x11 && use_ozone
config breaks the above mentioned tests on linux-rel bot then.

Bug: 1119772
Change-Id: I14a01e623a84510d8398171a58ecf45840f58a5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366901Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#800929}
parent cda732e5
......@@ -2349,11 +2349,20 @@ source_set("browser") {
"//ppapi/proxy:ipc",
"//ppapi/shared_impl",
]
if (use_ozone) {
# TODO(1119772): this makes both use_x11 and use_ozone builds for is_linux use
# pangocairo so that PPAPINaClNewlibTest.TrueTypeFont,
# PPAPINaClPNaClNonSfiTest.TrueTypeFont, and OutOfProcessPPAPITest.TrueTypeFont
# tests continue to run normally on Linux. This also fixes these tests for
# Ozone/Linux, but requires to use pangocairo. We probably want to continue
# using pango on Linux and switch to something else for other systems that
# use Ozone.
if (use_ozone && !is_desktop_linux) {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ]
} else if (use_pangocairo) {
sources += [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
}
if (is_linux || is_chromeos) {
deps += [ "//components/services/font:ppapi_fontconfig_matching" ]
}
......
......@@ -16,8 +16,6 @@
-OmniboxPopupContentsViewTest.ClickOmnibox
-OmniboxPopupContentsViewTest.PopupMatchesLocationBarBackground
-OutOfProcessPPAPITest.FlashClipboard
-PPAPINaClNewlibTest.TrueTypeFont
-PPAPINaClPNaClNonSfiTest.TrueTypeFont
-PageInfoBubbleViewBrowserTest.FocusDoesNotReturnToContentsOnReloadPrompt
-PageInfoBubbleViewBrowserTest.FocusReturnsToContentOnClose
-PaymentRequestCreditCardEditorTest.EditingExpiredCard
......
......@@ -3,4 +3,3 @@
-All/AuraWindowVideoCaptureDeviceBrowserTestP.CapturesContentChanges/3
-EventLatencyBrowserTest.KeyPressOnButton
-EventLatencyBrowserTest.KeyPressOnButtonWithAnimation
-OutOfProcessPPAPITest.TrueTypeFont
......@@ -3,8 +3,6 @@
# Failed
-DesktopCaptureApiTest.ChooseDesktopMedia
-OutOfProcessPPAPITest.FlashClipboard
-PPAPINaClNewlibTest.TrueTypeFont
-PPAPINaClPNaClNonSfiTest.TrueTypeFont
-WebRtcDesktopCaptureBrowserTest.RunsScreenshareFromOneTabToAnother
-WebRtcGetDisplayMediaBrowserTestWithPicker.GetDisplayMediaVideo
-WebRtcGetDisplayMediaBrowserTestWithPicker.GetDisplayMediaVideoAndAudio
......
# Fix these failures: https://crbug.com/1040382
# Failing tests
-OutOfProcessPPAPITest.TrueTypeFont
# Crashing tests
-TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedIframe/0
-TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedIframe/1
......
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