mojo/converters/surfaces/surfaces_type_converters.cc - Issue 952893003: Update from https://crrev.com/317530

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: mojo/converters/surfaces/surfaces_type_converters.cc

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 months 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: mojo/converters/surfaces/surfaces_type_converters.cc

diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc

index 0803ba62e0b25fccb6733f3831310af960760368..fe40d329d79a160b05b3bd7a8f845b4a86f3dea3 100644

--- a/mojo/converters/surfaces/surfaces_type_converters.cc

+++ b/mojo/converters/surfaces/surfaces_type_converters.cc

@@ -42,9 +42,9 @@ COMPILE_ASSERT(

cc::YUVVideoDrawQuad::REC_601 ==

static_cast<cc::YUVVideoDrawQuad::ColorSpace>(YUV_COLOR_SPACE_REC_601),

rec_601_enum_matches);

-COMPILE_ASSERT(cc::YUVVideoDrawQuad::REC_601_JPEG ==

+COMPILE_ASSERT(cc::YUVVideoDrawQuad::JPEG ==

static_cast<cc::YUVVideoDrawQuad::ColorSpace>(

- YUV_COLOR_SPACE_REC_601_JPEG),

+ YUV_COLOR_SPACE_JPEG),

rec_601_jpeg_enum_matches);

namespace {