components/font_service/font_service_app.cc - Issue 1468803002: Switch to static_assert.

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

Unified Diff: components/font_service/font_service_app.cc

Issue 1468803002: Switch to static_assert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assert1

Patch Set: message cleanup Created 5 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:

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 41a7f9e5a479b0e90ff3e500a03c9a2b53c69623..350bc5f07324bcaede39f55c4f4a3046ab0cbfae 100644

--- a/components/font_service/font_service_app.cc

+++ b/components/font_service/font_service_app.cc

@@ -9,19 +9,18 @@

#include "mojo/application/public/cpp/application_connection.h"

#include "mojo/platform_handle/platform_handle_functions.h"

-COMPILE_ASSERT(static_cast<uint32>(SkTypeface::kNormal) ==

- static_cast<uint32>(font_service::TYPEFACE_STYLE_NORMAL),

- typeface_flags_should_match);

-COMPILE_ASSERT(static_cast<uint32>(SkTypeface::kBold) ==

- static_cast<uint32>(font_service::TYPEFACE_STYLE_BOLD),

- typeface_flags_should_match);

-COMPILE_ASSERT(static_cast<uint32>(SkTypeface::kItalic) ==

- static_cast<uint32>(font_service::TYPEFACE_STYLE_ITALIC),

- typeface_flags_should_match);

-COMPILE_ASSERT(

- static_cast<uint32>(SkTypeface::kBoldItalic) ==

- static_cast<uint32>(font_service::TYPEFACE_STYLE_BOLD_ITALIC),

- typeface_flags_should_match);

+static_assert(static_cast<uint32>(SkTypeface::kNormal) ==

+ static_cast<uint32>(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),

+ "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),

+ "Skia and font service flags must match");

namespace {