| Index: components/font_service/font_service_app.cc
|
| diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc
|
| index 350bc5f07324bcaede39f55c4f4a3046ab0cbfae..110118527c915a54f88ee3dc0e226348504d8dee 100644
|
| --- a/components/font_service/font_service_app.cc
|
| +++ b/components/font_service/font_service_app.cc
|
| @@ -9,18 +9,19 @@
|
| #include "mojo/application/public/cpp/application_connection.h"
|
| #include "mojo/platform_handle/platform_handle_functions.h"
|
|
|
| -static_assert(static_cast<uint32>(SkTypeface::kNormal) ==
|
| - static_cast<uint32>(font_service::TYPEFACE_STYLE_NORMAL),
|
| +static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
|
| + static_cast<uint32_t>(font_service::TYPEFACE_STYLE_NORMAL),
|
| "Skia and font service flags must match");
|
| -static_assert(static_cast<uint32>(SkTypeface::kBold) ==
|
| - static_cast<uint32>(font_service::TYPEFACE_STYLE_BOLD),
|
| +static_assert(static_cast<uint32_t>(SkTypeface::kBold) ==
|
| + static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD),
|
| "Skia and font service flags must match");
|
| -static_assert(static_cast<uint32>(SkTypeface::kItalic) ==
|
| - static_cast<uint32>(font_service::TYPEFACE_STYLE_ITALIC),
|
| - "Skia and font service flags must match");
|
| -static_assert(static_cast<uint32>(SkTypeface::kBoldItalic) ==
|
| - static_cast<uint32>(font_service::TYPEFACE_STYLE_BOLD_ITALIC),
|
| +static_assert(static_cast<uint32_t>(SkTypeface::kItalic) ==
|
| + static_cast<uint32_t>(font_service::TYPEFACE_STYLE_ITALIC),
|
| "Skia and font service flags must match");
|
| +static_assert(
|
| + static_cast<uint32_t>(SkTypeface::kBoldItalic) ==
|
| + static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD_ITALIC),
|
| + "Skia and font service flags must match");
|
|
|
| namespace {
|
|
|
|
|