Fix build with GCC 7.0

Fixes a few problems with using undeclared functions and ambigious
code.

Task-number: QTBUG-59776
Change-Id: Ifcaecda4d210c52362616d984bd1259fc763874c
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 4 insertions, 1 deletions

diff --git a/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h b/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
index d8c66902263..50e39dcb47e 100644
--- a/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+++ b/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
@@ -9,6 +9,7 @@
 #include "platform/graphics/WebGraphicsContext3DProviderWrapper.h"
 #include "platform/wtf/ThreadSpecific.h"
 
+#include <functional>
 #include <memory>
 
 namespace blink {
diff --git a/chromium/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
index 2b78d242386..393d5244650 100644
--- a/chromium/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
+++ b/chromium/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
@@ -725,6 +725,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(
   return *this;
 }
 
+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
+
 template <typename T, typename U, typename V, typename W>
 inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
   impl_.swap(other.impl_);
diff --git a/chromium/third_party/WebKit/Source/platform/wtf/text/TextCodec.h b/chromium/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
index 2f8f3c86638..bef4fd7ab79 100644
--- a/chromium/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
+++ b/chromium/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
@@ -73,7 +73,7 @@ enum FlushBehavior {
 
 static_assert(!kDoNotFlush, "DoNotFlush should be falsy");
 static_assert(kFetchEOF, "FetchEOF should be truthy");
-static_assert(kDataEOF, "DataEOF should be truthy");
+static_assert(kDataEOF != 0, "DataEOF should be truthy");
 
 class WTF_EXPORT TextCodec {
   WTF_MAKE_NONCOPYABLE(TextCodec);