--- a/gpu/ipc/common/mailbox_struct_traits.h +++ b/gpu/ipc/common/mailbox_struct_traits.h @@ -15,7 +15,7 @@ namespace mojo { template <> struct StructTraits { static base::span name(const gpu::Mailbox& mailbox) { - return mailbox.name; + return base::make_span(mailbox.name); } static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); }; --- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h +++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h @@ -134,7 +134,7 @@ struct StructTraits { static base::span matrix(const cc::FilterOperation& operation) { if (operation.type() != cc::FilterOperation::COLOR_MATRIX) return base::span(); - return operation.matrix(); + return base::make_span(operation.matrix()); } static base::span shape( --- a/services/viz/public/cpp/compositing/quads_struct_traits.h +++ b/services/viz/public/cpp/compositing/quads_struct_traits.h @@ -284,7 +284,7 @@ static base::span vertex_opacity(const cc::DrawQuad& input) { const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); - return quad->vertex_opacity; + return base::make_span(quad->vertex_opacity); } static bool y_flipped(const cc::DrawQuad& input) { --- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp +++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp @@ -480,7 +480,7 @@ WebString AccessControlErrorString( } default: NOTREACHED(); - return ""; + return WebString(); } } @@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, } default: NOTREACHED(); - return ""; + return WebString(); } } @@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, } default: NOTREACHED(); - return ""; + return WebString(); } }