Skip to content

GitLab

T
tangled
Commit dad5efae authored by Sky Malice's avatar Sky Malice Committed by Commit Bot
Browse files
Options

Revert "Reland: Add Google Sans to FontUniqueNameLookup browser test" 

This reverts commit fbde9d8b.

Reason for revert: Failing tests https://ci.chromium.org/p/chromium/builders/ci/Marshmallow%2064%20bit%20Tester/33521

Original change's description:
> Reland: Add Google Sans to FontUniqueNameLookup browser test
>
> Work around previous failure on SkiaRenderer,Vulkan bot by not running
> the tests there.
>
> This will help ensure we have local access to the Google Sans although
> the bots only verify this on Pixel devices, not on OEM devices which
> retrieve Google Sans from GMScore. Currently there is only manual
> verification for the latter.
>
> Bug: 1115064, 1129552
> Change-Id: I7817499d1cc6e60e9a151641022fd1f2de3c51e9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2475698
> Commit-Queue: Dominik Röttsches <drott@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#817829}

TBR=avi@chromium.org,drott@chromium.org

Change-Id: I32809b32ddc91062e2149de90721295f063f6ad8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1115064
Bug: 1129552
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481008Reviewed-by: default avatarSky Malice <skym@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818042}
parent 48026448
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 31 deletions
content/browser/font_unique_name_lookup/font_unique_name_browsertest.cc
View file @ dad5efae
......@@ -20,18 +20,10 @@
#include "content/browser/renderer_host/dwrite_font_lookup_table_builder_win.h"
#endif
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
#include "base/feature_list.h"
#include "components/viz/common/features.h"
#include "gpu/config/gpu_finch_features.h"
#endif
namespace content {
namespace {
#if defined(OS_ANDROID)
const char* kGoogleSans = "Google Sans";
const char* kExpectedFontFamilyNames[] = {"AndroidClock",
"Roboto",
"Droid Sans Mono",
......@@ -72,10 +64,7 @@ const char* kExpectedFontFamilyNames[] = {"AndroidClock",
"Roboto Condensed",
"Roboto Condensed",
"Roboto Condensed",
"Roboto",
kGoogleSans,
kGoogleSans,
kGoogleSans};
"Roboto"};
#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
const char* kExpectedFontFamilyNames[] = {"Ahem",
"Arimo",
......@@ -215,22 +204,6 @@ IN_PROC_BROWSER_TEST_F(FontUniqueNameBrowserTest, ContentLocalFontsMatching) {
ASSERT_TRUE(first_font_name);
ASSERT_TRUE(first_font_name->is_string());
ASSERT_GT(first_font_name->GetString().size(), 0u);
#if defined(OS_ANDROID)
// Skip Android Google Sans test on Pixel devices < Marshmallow SDK level,
// as the firmware font files do not contain this font.
bool at_least_marshmallow =
base::android::BuildInfo::GetInstance()->sdk_int() >=
base::android::SDK_VERSION_MARSHMALLOW;
// https://crbug.com/1129552 work around the SkiaRenderer Vulkan bot not
// having the Google Sans font.
bool on_vulkan_bot =
base::FeatureList::IsEnabled(features::kUseSkiaRenderer) &&
base::FeatureList::IsEnabled(features::kVulkan);
if ((!at_least_marshmallow || on_vulkan_bot) &&
std::string(kExpectedFontFamilyNames[i]) == std::string(kGoogleSans)) {
continue;
}
#endif
ASSERT_EQ(first_font_name->GetString(), kExpectedFontFamilyNames[i]);
}
}
......
content/test/data/font_src_local_matching.html
View file @ dad5efae
......@@ -51,9 +51,6 @@ function getFontsWithTestCharsForOS() {
["RobotoCondensed-Italic", "0"],
["RobotoCondensed-Regular", "0"],
["Roboto-Italic", "0"],
["Google Sans", "0"],
["Google Sans Medium", "0"],
["Google Sans Bold", "0"],
];
} else if (navigator.userAgent.indexOf("Linux") !== -1
|| navigator.userAgent.indexOf("CrOS") !== -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