e36a0c8
diff -up chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h
e36a0c8
--- chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3	2018-03-06 18:04:32.000000000 -0500
e36a0c8
+++ chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h	2018-03-07 10:42:07.198179638 -0500
e36a0c8
@@ -15,7 +15,7 @@ namespace mojo {
e36a0c8
 template <>
e36a0c8
 struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
e36a0c8
   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
e36a0c8
-    return mailbox.name;
e36a0c8
+    return base::make_span(mailbox.name);
e36a0c8
   }
e36a0c8
   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
e36a0c8
 };
e36a0c8
diff -up chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
e36a0c8
--- chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3	2018-03-06 18:04:37.000000000 -0500
e36a0c8
+++ chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h	2018-03-07 10:42:07.198179638 -0500
e36a0c8
@@ -138,7 +138,7 @@ struct StructTraits
e36a0c8
   static base::span<const float> matrix(const cc::FilterOperation& operation) {
e36a0c8
     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
e36a0c8
       return base::span<const float>();
e36a0c8
-    return operation.matrix();
e36a0c8
+    return base::make_span(operation.matrix());
e36a0c8
   }
e36a0c8
 
e36a0c8
   static base::span<const gfx::Rect> shape(
e36a0c8
diff -up chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h
e36a0c8
--- chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3	2018-03-06 18:04:37.000000000 -0500
e36a0c8
+++ chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h	2018-03-07 10:42:07.198179638 -0500
e36a0c8
@@ -308,7 +308,7 @@ struct StructTraits
e36a0c8
   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
e36a0c8
     const viz::TextureDrawQuad* quad =
e36a0c8
         viz::TextureDrawQuad::MaterialCast(&input);
e36a0c8
-    return quad->vertex_opacity;
e36a0c8
+    return base::make_span(quad->vertex_opacity);
e36a0c8
   }
e36a0c8
 
e36a0c8
   static bool y_flipped(const viz::DrawQuad& input) {
e36a0c8
diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
e36a0c8
--- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3	2018-03-06 18:05:06.000000000 -0500
e36a0c8
+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h	2018-03-07 10:48:53.996093882 -0500
e36a0c8
@@ -62,7 +62,7 @@ class WTF_EXPORT ArrayBufferContents {
e36a0c8
           allocation_length_(length),
e36a0c8
           data_(data),
e36a0c8
           data_length_(length),
e36a0c8
-          kind_(AllocationKind::kNormal),
e36a0c8
+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
e36a0c8
           deleter_(deleter) {}
e36a0c8
     DataHandle(void* allocation_base,
e36a0c8
                size_t allocation_length,
e36a0c8
@@ -93,11 +93,11 @@ class WTF_EXPORT ArrayBufferContents {
e36a0c8
              reinterpret_cast<uintptr_t>(allocation_base_) +
e36a0c8
                  allocation_length_);
e36a0c8
       switch (kind_) {
e36a0c8
-        case AllocationKind::kNormal:
e36a0c8
+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
e36a0c8
           DCHECK(deleter_);
e36a0c8
           deleter_(data_);
e36a0c8
           return;
e36a0c8
-        case AllocationKind::kReservation:
e36a0c8
+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
e36a0c8
           ReleaseReservedMemory(allocation_base_, allocation_length_);
e36a0c8
           return;
e36a0c8
       }
e36a0c8
diff -up chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
e36a0c8
--- chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3	2018-03-06 18:06:09.000000000 -0500
e36a0c8
+++ chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2018-03-07 10:42:07.199179616 -0500
e36a0c8
@@ -10,7 +10,7 @@
e36a0c8
 
e36a0c8
 #include "modules/audio_processing/aec3/aec_state.h"
e36a0c8
 
e36a0c8
-#include <math.h>
e36a0c8
+#include <cmath>
e36a0c8
 
e36a0c8
 #include <numeric>
e36a0c8
 #include <vector>