Fix build with gcc 5.x

Change-Id: I93f710ed9c493d11c4982ef46c4fba20424b0b14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 8 insertions, 8 deletions

diff --git a/chromium/base/time/time.h b/chromium/base/time/time.h
index 2befad3918d..f07f258c8ce 100644
--- a/chromium/base/time/time.h
+++ b/chromium/base/time/time.h
@@ -724,7 +724,7 @@ constexpr TimeDelta TimeDelta::FromDouble(double value) {
 // static
 constexpr TimeDelta TimeDelta::FromProduct(int64_t value,
                                            int64_t positive_value) {
-  DCHECK(positive_value > 0);
+//  DCHECK(positive_value > 0);
   return value > std::numeric_limits<int64_t>::max() / positive_value
              ? Max()
              : value < std::numeric_limits<int64_t>::min() / positive_value
diff --git a/chromium/gpu/ipc/common/mailbox_struct_traits.h b/chromium/gpu/ipc/common/mailbox_struct_traits.h
index c7dbc90ed15..93733b7038f 100644
--- a/chromium/gpu/ipc/common/mailbox_struct_traits.h
+++ b/chromium/gpu/ipc/common/mailbox_struct_traits.h
@@ -15,7 +15,7 @@ namespace mojo {
 template <>
 struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-    return mailbox.name;
+    return base::span<const int8_t>(mailbox.name);
   }
   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
 };
diff --git a/chromium/services/viz/public/cpp/compositing/filter_operation_struct_traits.h b/chromium/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
index 63d2f70e0e1..0eb5c5d172d 100644
--- a/chromium/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+++ b/chromium/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
   static base::span<const float> matrix(const cc::FilterOperation& operation) {
     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
       return base::span<const float>();
-    return operation.matrix();
+    return base::span<const float>(operation.matrix());
   }
 
   static base::span<const gfx::Rect> shape(
diff --git a/chromium/services/viz/public/cpp/compositing/quads_struct_traits.h b/chromium/services/viz/public/cpp/compositing/quads_struct_traits.h
index 06e83b3d8f4..d1a7eae7b41 100644
--- a/chromium/services/viz/public/cpp/compositing/quads_struct_traits.h
+++ b/chromium/services/viz/public/cpp/compositing/quads_struct_traits.h
@@ -309,7 +309,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
     const viz::TextureDrawQuad* quad =
         viz::TextureDrawQuad::MaterialCast(&input);
-    return quad->vertex_opacity;
+    return base::span<const float>(quad->vertex_opacity);
   }
 
   static bool y_flipped(const viz::DrawQuad& input) {
diff --git a/chromium/third_party/WebKit/Source/platform/exported/WebCORS.cpp b/chromium/third_party/WebKit/Source/platform/exported/WebCORS.cpp
index 00c3695d9da..dca92112d64 100644
--- a/chromium/third_party/WebKit/Source/platform/exported/WebCORS.cpp
+++ b/chromium/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("");
   }
 }
 
diff --git a/chromium/third_party/WebKit/public/web/WebFrameClient.h b/chromium/third_party/WebKit/public/web/WebFrameClient.h
index 213093ba8c8..67ca37e9fea 100644
--- a/chromium/third_party/WebKit/public/web/WebFrameClient.h
+++ b/chromium/third_party/WebKit/public/web/WebFrameClient.h
@@ -507,7 +507,7 @@ class BLINK_EXPORT WebFrameClient {
   // Returns string to be used as a frame id in the devtools protocol.
   // It is derived from the content's devtools_frame_token, is
   // defined by the browser and passed into Blink upon frame creation.
-  virtual WebString GetInstrumentationToken() { return ""; }
+  virtual WebString GetInstrumentationToken() { return WebString(""); }
 
   // PlzNavigate
   // Called to abort a navigation that is being handled by the browser process.