Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > 8d8aa539d8583d63c3ddb42fc420531f > files > 29

chromium-browser-stable-67.0.3396.62-1.mga6.src.rpm

--- chromium-67.0.3396.48/base/containers/flat_map.h.gcc5	2018-05-19 11:50:00.921985640 +0200
+++ chromium-67.0.3396.48/base/containers/flat_map.h	2018-05-19 12:02:47.491823637 +0200
@@ -180,6 +180,7 @@
   using tree::tree;
   using tree::operator=;
 
+  flat_map();
   flat_map(flat_map const &);
   flat_map(flat_map &&);
   flat_map& operator=(const flat_map&);
@@ -224,6 +225,9 @@
 // Copy/move constructors and copy/move assignment operators.
 
 template <class Key, class Mapped, class Compare>
+flat_map<Key, Mapped, Compare>::flat_map() = default;
+
+template <class Key, class Mapped, class Compare>
 flat_map<Key, Mapped, Compare>::flat_map(const flat_map &) = default;
 
 template <class Key, class Mapped, class Compare>
--- chromium-67.0.3396.48/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp.gcc5	2018-05-16 21:12:41.000000000 +0200
+++ chromium-67.0.3396.48/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp	2018-05-19 12:54:01.933774463 +0200
@@ -18,6 +18,9 @@
 #include "compiler/translator/SymbolTable.h"
 #include "compiler/translator/tree_util/BuiltIn_autogen.h"
 
+#undef isinf
+#undef isnan
+
 namespace sh
 {
 
--- chromium-67.0.3396.48/third_party/angle/third_party/vulkan-validation-layers/src/layers/parameter_validation_utils.cpp.gcc5	2018-05-16 21:12:46.000000000 +0200
+++ chromium-67.0.3396.48/third_party/angle/third_party/vulkan-validation-layers/src/layers/parameter_validation_utils.cpp	2018-05-19 12:56:43.973697280 +0200
@@ -21,7 +21,7 @@
 #define NOMINMAX
 
 #include <limits.h>
-#include <math.h>
+#include <cmath>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- chromium-67.0.3396.48/third_party/pdfium/xfa/fxfa/parser/cxfa_box.cpp.gcc5	2018-05-16 21:12:45.000000000 +0200
+++ chromium-67.0.3396.48/third_party/pdfium/xfa/fxfa/parser/cxfa_box.cpp	2018-05-19 14:18:08.702192298 +0200
@@ -121,7 +121,7 @@
 
 std::tuple<XFA_AttributeEnum, bool, float> CXFA_Box::Get3DStyle() {
   if (GetElementType() == XFA_Element::Arc)
-    return {XFA_AttributeEnum::Unknown, false, 0.0f};
+    return std::tuple<XFA_AttributeEnum, bool, float>(XFA_AttributeEnum::Unknown, false, 0.0f);
 
   std::vector<CXFA_Stroke*> strokes = GetStrokesInternal(true);
   CXFA_Stroke* stroke;
@@ -129,9 +129,9 @@
 
   std::tie(iType, stroke) = Style3D(strokes);
   if (iType == XFA_AttributeEnum::Unknown)
-    return {XFA_AttributeEnum::Unknown, false, 0.0f};
+    return std::tuple<XFA_AttributeEnum, bool, float>(XFA_AttributeEnum::Unknown, false, 0.0f);
 
-  return {iType, stroke->IsVisible(), stroke->GetThickness()};
+  return std::tuple<XFA_AttributeEnum, bool, float>(iType, stroke->IsVisible(), stroke->GetThickness());
 }
 
 std::vector<CXFA_Stroke*> CXFA_Box::GetStrokesInternal(bool bNull) {
--- chromium-67.0.3396.48/third_party/pdfium/xfa/fxfa/parser/cxfa_occur.cpp.gcc5	2018-05-16 21:12:45.000000000 +0200
+++ chromium-67.0.3396.48/third_party/pdfium/xfa/fxfa/parser/cxfa_occur.cpp	2018-05-19 14:26:00.272054824 +0200
@@ -56,7 +56,7 @@
 
   Optional<int32_t> init =
       JSObject()->TryInteger(XFA_Attribute::Initial, false);
-  return {iMin, iMax, init && *init >= iMin ? *init : iMin};
+  return std::tuple<int32_t, int32_t, int32_t>(iMin, iMax, init && *init >= iMin ? *init : iMin);
 }
 
 void CXFA_Occur::SetMax(int32_t iMax) {
--- chromium-67.0.3396.48/gpu/command_buffer/service/texture_manager.cc.gcc5	2018-05-16 21:10:30.000000000 +0200
+++ chromium-67.0.3396.48/gpu/command_buffer/service/texture_manager.cc	2018-05-19 14:44:09.521940261 +0200
@@ -131,130 +131,130 @@
   FormatTypeValidator() {
     static const FormatType kSupportedFormatTypes[] = {
         // ES2.
-        {GL_RGB, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
-        {GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE},
-        {GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE},
+        FormatType(GL_RGB, GL_RGB, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5),
+        FormatType(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4),
+        FormatType(GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1),
+        FormatType(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE),
+        FormatType(GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE),
+        FormatType(GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE),
 
         // ES3.
-        {GL_R8, GL_RED, GL_UNSIGNED_BYTE},
-        {GL_R8_SNORM, GL_RED, GL_BYTE},
-        {GL_R16F, GL_RED, GL_HALF_FLOAT},
-        {GL_R16F, GL_RED, GL_FLOAT},
-        {GL_R32F, GL_RED, GL_FLOAT},
-        {GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_R8I, GL_RED_INTEGER, GL_BYTE},
-        {GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_R16I, GL_RED_INTEGER, GL_SHORT},
-        {GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT},
-        {GL_R32I, GL_RED_INTEGER, GL_INT},
-        {GL_RG8, GL_RG, GL_UNSIGNED_BYTE},
-        {GL_RG8_SNORM, GL_RG, GL_BYTE},
-        {GL_RG16F, GL_RG, GL_HALF_FLOAT},
-        {GL_RG16F, GL_RG, GL_FLOAT},
-        {GL_RG32F, GL_RG, GL_FLOAT},
-        {GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RG8I, GL_RG_INTEGER, GL_BYTE},
-        {GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RG16I, GL_RG_INTEGER, GL_SHORT},
-        {GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT},
-        {GL_RG32I, GL_RG_INTEGER, GL_INT},
-        {GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_SRGB8, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE},
-        {GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
-        {GL_RGB8_SNORM, GL_RGB, GL_BYTE},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_HALF_FLOAT},
-        {GL_R11F_G11F_B10F, GL_RGB, GL_FLOAT},
-        {GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV},
-        {GL_RGB9_E5, GL_RGB, GL_HALF_FLOAT},
-        {GL_RGB9_E5, GL_RGB, GL_FLOAT},
-        {GL_RGB16F, GL_RGB, GL_HALF_FLOAT},
-        {GL_RGB16F, GL_RGB, GL_FLOAT},
-        {GL_RGB32F, GL_RGB, GL_FLOAT},
-        {GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RGB8I, GL_RGB_INTEGER, GL_BYTE},
-        {GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RGB16I, GL_RGB_INTEGER, GL_SHORT},
-        {GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT},
-        {GL_RGB32I, GL_RGB_INTEGER, GL_INT},
-        {GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA8_SNORM, GL_RGBA, GL_BYTE},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
-        {GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA4, GL_RGBA, GL_UNSIGNED_BYTE},
-        {GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
-        {GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT},
-        {GL_RGBA16F, GL_RGBA, GL_FLOAT},
-        {GL_RGBA32F, GL_RGBA, GL_FLOAT},
-        {GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE},
-        {GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE},
-        {GL_RGB10_A2UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV},
-        {GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT},
-        {GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT},
-        {GL_RGBA32I, GL_RGBA_INTEGER, GL_INT},
-        {GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
-        {GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT},
-        {GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
-        {GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL,
-         GL_FLOAT_32_UNSIGNED_INT_24_8_REV},
+        FormatType(GL_R8, GL_RED, GL_UNSIGNED_BYTE),
+        FormatType(GL_R8_SNORM, GL_RED, GL_BYTE),
+        FormatType(GL_R16F, GL_RED, GL_HALF_FLOAT),
+        FormatType(GL_R16F, GL_RED, GL_FLOAT),
+        FormatType(GL_R32F, GL_RED, GL_FLOAT),
+        FormatType(GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE),
+        FormatType(GL_R8I, GL_RED_INTEGER, GL_BYTE),
+        FormatType(GL_R16UI, GL_RED_INTEGER, GL_UNSIGNED_SHORT),
+        FormatType(GL_R16I, GL_RED_INTEGER, GL_SHORT),
+        FormatType(GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT),
+        FormatType(GL_R32I, GL_RED_INTEGER, GL_INT),
+        FormatType(GL_RG8, GL_RG, GL_UNSIGNED_BYTE),
+        FormatType(GL_RG8_SNORM, GL_RG, GL_BYTE),
+        FormatType(GL_RG16F, GL_RG, GL_HALF_FLOAT),
+        FormatType(GL_RG16F, GL_RG, GL_FLOAT),
+        FormatType(GL_RG32F, GL_RG, GL_FLOAT),
+        FormatType(GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE),
+        FormatType(GL_RG8I, GL_RG_INTEGER, GL_BYTE),
+        FormatType(GL_RG16UI, GL_RG_INTEGER, GL_UNSIGNED_SHORT),
+        FormatType(GL_RG16I, GL_RG_INTEGER, GL_SHORT),
+        FormatType(GL_RG32UI, GL_RG_INTEGER, GL_UNSIGNED_INT),
+        FormatType(GL_RG32I, GL_RG_INTEGER, GL_INT),
+        FormatType(GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE),
+        FormatType(GL_SRGB8, GL_RGB, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGB565, GL_RGB, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5),
+        FormatType(GL_RGB8_SNORM, GL_RGB, GL_BYTE),
+        FormatType(GL_R11F_G11F_B10F, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV),
+        FormatType(GL_R11F_G11F_B10F, GL_RGB, GL_HALF_FLOAT),
+        FormatType(GL_R11F_G11F_B10F, GL_RGB, GL_FLOAT),
+        FormatType(GL_RGB9_E5, GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV),
+        FormatType(GL_RGB9_E5, GL_RGB, GL_HALF_FLOAT),
+        FormatType(GL_RGB9_E5, GL_RGB, GL_FLOAT),
+        FormatType(GL_RGB16F, GL_RGB, GL_HALF_FLOAT),
+        FormatType(GL_RGB16F, GL_RGB, GL_FLOAT),
+        FormatType(GL_RGB32F, GL_RGB, GL_FLOAT),
+        FormatType(GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGB8I, GL_RGB_INTEGER, GL_BYTE),
+        FormatType(GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT),
+        FormatType(GL_RGB16I, GL_RGB_INTEGER, GL_SHORT),
+        FormatType(GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT),
+        FormatType(GL_RGB32I, GL_RGB_INTEGER, GL_INT),
+        FormatType(GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE),
+        FormatType(GL_SRGB8_ALPHA8, GL_RGBA, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGBA8_SNORM, GL_RGBA, GL_BYTE),
+        FormatType(GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1),
+        FormatType(GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV),
+        FormatType(GL_RGBA4, GL_RGBA, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGBA4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4),
+        FormatType(GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV),
+        FormatType(GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT),
+        FormatType(GL_RGBA16F, GL_RGBA, GL_FLOAT),
+        FormatType(GL_RGBA32F, GL_RGBA, GL_FLOAT),
+        FormatType(GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE),
+        FormatType(GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE),
+        FormatType(GL_RGB10_A2UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_2_10_10_10_REV),
+        FormatType(GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT),
+        FormatType(GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT),
+        FormatType(GL_RGBA32I, GL_RGBA_INTEGER, GL_INT),
+        FormatType(GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT),
+        FormatType(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT),
+        FormatType(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT),
+        FormatType(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT),
+        FormatType(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT),
+        FormatType(GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8),
+        FormatType(GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL,
+         GL_FLOAT_32_UNSIGNED_INT_24_8_REV),
 
         // Exposed by GL_APPLE_texture_format_BGRA8888 for TexStorage*
         // TODO(kainino): this actually exposes it for (Copy)TexImage* as well,
         // which is incorrect. crbug.com/663086
-        {GL_BGRA8_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
+        FormatType(GL_BGRA8_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE),
 
         // Exposed by GL_APPLE_texture_format_BGRA8888 and
         // GL_EXT_texture_format_BGRA8888
-        {GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE},
+        FormatType(GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE),
 
         // Exposed by GL_EXT_texture_norm16
-        {GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT},
+        FormatType(GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT),
     };
 
     static const FormatType kSupportedFormatTypesES2Only[] = {
         // Exposed by GL_OES_texture_float and GL_OES_texture_half_float
-        {GL_RGB, GL_RGB, GL_FLOAT},
-        {GL_RGBA, GL_RGBA, GL_FLOAT},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT},
-        {GL_ALPHA, GL_ALPHA, GL_FLOAT},
-        {GL_RGB, GL_RGB, GL_HALF_FLOAT_OES},
-        {GL_RGBA, GL_RGBA, GL_HALF_FLOAT_OES},
-        {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES},
-        {GL_LUMINANCE, GL_LUMINANCE, GL_HALF_FLOAT_OES},
-        {GL_ALPHA, GL_ALPHA, GL_HALF_FLOAT_OES},
+        FormatType(GL_RGB, GL_RGB, GL_FLOAT),
+        FormatType(GL_RGBA, GL_RGBA, GL_FLOAT),
+        FormatType(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT),
+        FormatType(GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT),
+        FormatType(GL_ALPHA, GL_ALPHA, GL_FLOAT),
+        FormatType(GL_RGB, GL_RGB, GL_HALF_FLOAT_OES),
+        FormatType(GL_RGBA, GL_RGBA, GL_HALF_FLOAT_OES),
+        FormatType(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES),
+        FormatType(GL_LUMINANCE, GL_LUMINANCE, GL_HALF_FLOAT_OES),
+        FormatType(GL_ALPHA, GL_ALPHA, GL_HALF_FLOAT_OES),
 
         // Exposed by GL_ANGLE_depth_texture
-        {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT},
-        {GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT},
-        {GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8},
+        FormatType(GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT),
+        FormatType(GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT),
+        FormatType(GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8),
 
         // Exposed by GL_EXT_sRGB
-        {GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE},
-        {GL_SRGB_ALPHA, GL_SRGB_ALPHA, GL_UNSIGNED_BYTE},
+        FormatType(GL_SRGB, GL_SRGB, GL_UNSIGNED_BYTE),
+        FormatType(GL_SRGB_ALPHA, GL_SRGB_ALPHA, GL_UNSIGNED_BYTE),
 
         // Exposed by GL_EXT_texture_rg
-        {GL_RED, GL_RED, GL_UNSIGNED_BYTE},
-        {GL_RG, GL_RG, GL_UNSIGNED_BYTE},
-        {GL_RED, GL_RED, GL_FLOAT},
-        {GL_RG, GL_RG, GL_FLOAT},
-        {GL_RED, GL_RED, GL_HALF_FLOAT_OES},
-        {GL_RG, GL_RG, GL_HALF_FLOAT_OES},
+        FormatType(GL_RED, GL_RED, GL_UNSIGNED_BYTE),
+        FormatType(GL_RG, GL_RG, GL_UNSIGNED_BYTE),
+        FormatType(GL_RED, GL_RED, GL_FLOAT),
+        FormatType(GL_RG, GL_RG, GL_FLOAT),
+        FormatType(GL_RED, GL_RED, GL_HALF_FLOAT_OES),
+        FormatType(GL_RG, GL_RG, GL_HALF_FLOAT_OES),
 
         // Exposed by GL_EXT_texture_norm16
-        {GL_RED, GL_RED, GL_UNSIGNED_SHORT},
+        FormatType(GL_RED, GL_RED, GL_UNSIGNED_SHORT),
     };
 
     for (size_t ii = 0; ii < arraysize(kSupportedFormatTypes); ++ii) {
@@ -269,7 +269,7 @@
   // This may be accessed from multiple threads.
   bool IsValid(ContextType context_type, GLenum internal_format, GLenum format,
                GLenum type) const {
-    FormatType query = { internal_format, format, type };
+    FormatType query = FormatType( internal_format, format, type );
     if (supported_combinations_.find(query) != supported_combinations_.end()) {
       return true;
     }
--- chromium-67.0.3396.48/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.gcc5	2018-05-20 10:28:11.332693173 +0200
+++ chromium-67.0.3396.48/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc	2018-05-20 10:28:32.862697114 +0200
@@ -129,7 +129,7 @@
   route.set_controller_type(RouteControllerType::kGeneric);
 
   Presentation& presentation =
-      presentations_.emplace(presentation_id, route).first->second;
+      presentations_.emplace(presentation_id, Presentation(route)).first->second;
   presentation.set_receiver(
       CreatePresentationReceiver(presentation_id, &presentation, *display));
   presentation.receiver()->Start(presentation_id, GURL(media_source));
--- chromium-67.0.3396.48/chrome/browser/vr/sounds_manager_audio_delegate.h.gcc5	2018-05-20 11:00:06.822712757 +0200
+++ chromium-67.0.3396.48/chrome/browser/vr/sounds_manager_audio_delegate.h	2018-05-20 11:00:27.202713142 +0200
@@ -23,7 +23,7 @@
   void PlaySound(SoundId id) override;
 
  private:
-  std::unordered_map<SoundId, std::unique_ptr<std::string>> sounds_;
+  std::unordered_map<SoundId, std::unique_ptr<std::string>, std::hash<int>> sounds_;
 
   DISALLOW_COPY_AND_ASSIGN(SoundsManagerAudioDelegate);
 };
--- chromium-67.0.3396.48/chrome/browser/vr/assets_loader.cc.gcc5	2018-05-16 21:10:20.000000000 +0200
+++ chromium-67.0.3396.48/chrome/browser/vr/assets_loader.cc	2018-05-20 11:03:30.442720994 +0200
@@ -209,15 +209,19 @@
 
   std::vector<std::tuple<const char*, const base::FilePath::CharType*,
                          std::unique_ptr<std::string>*>>
-      sounds = {{kMinVersionWithSounds, kButtonHoverSoundFilename,
-                 &assets->button_hover_sound},
-                {kMinVersionWithSounds, kButtonClickSoundFilename,
-                 &assets->button_click_sound},
-                {kMinVersionWithSounds, kBackButtonClickSoundFilename,
-                 &assets->back_button_click_sound},
-                {kMinVersionWithInactiveButtonClickSound,
+      sounds = {std::tuple<const char*, const base::FilePath::CharType*,
+                         std::unique_ptr<std::string>*>(kMinVersionWithSounds, kButtonHoverSoundFilename,
+                 &assets->button_hover_sound),
+                std::tuple<const char*, const base::FilePath::CharType*,
+                         std::unique_ptr<std::string>*>(kMinVersionWithSounds, kButtonClickSoundFilename,
+                 &assets->button_click_sound),
+                std::tuple<const char*, const base::FilePath::CharType*,
+                         std::unique_ptr<std::string>*>(kMinVersionWithSounds, kBackButtonClickSoundFilename,
+                 &assets->back_button_click_sound),
+                std::tuple<const char*, const base::FilePath::CharType*,
+                         std::unique_ptr<std::string>*>(kMinVersionWithInactiveButtonClickSound,
                  kInactiveButtonClickSoundFilename,
-                 &assets->inactive_button_click_sound}};
+                 &assets->inactive_button_click_sound)};
 
   auto sounds_iter = sounds.begin();
   while (status == AssetsLoadStatus::kSuccess && sounds_iter != sounds.end()) {
--- chromium-67.0.3396.48/chrome/browser/vr/ui_scene_creator.cc.gcc5	2018-05-16 21:10:20.000000000 +0200
+++ chromium-67.0.3396.48/chrome/browser/vr/ui_scene_creator.cc	2018-05-20 11:15:05.802793285 +0200
@@ -2247,8 +2247,8 @@
   std::vector<
       std::tuple<UiElementName, LayoutAlignment, const gfx::VectorIcon&>>
       menu_buttons = {
-          {kOverflowMenuFordwardButton, LEFT, vector_icons::kForwardArrowIcon},
-          {kOverflowMenuReloadButton, RIGHT, vector_icons::kReloadIcon},
+          std::tuple<UiElementName, LayoutAlignment, const gfx::VectorIcon&>(kOverflowMenuFordwardButton, LEFT, vector_icons::kForwardArrowIcon),
+          std::tuple<UiElementName, LayoutAlignment, const gfx::VectorIcon&>(kOverflowMenuReloadButton, RIGHT, vector_icons::kReloadIcon),
       };
   for (auto& item : menu_buttons) {
     auto button = Create<VectorIconButton>(std::get<0>(item), kPhaseForeground,
@@ -2307,9 +2307,9 @@
   overflow_layout->AddChild(std::move(button_spacer));
 
   std::vector<std::tuple<UiElementName, int>> menu_items = {
-      {kOverflowMenuCloseAllIncognitoTabsItem,
-       IDS_VR_MENU_CLOSE_INCOGNITO_TABS},
-      {kOverflowMenuNewIncognitoTabItem, IDS_VR_MENU_NEW_INCOGNITO_TAB},
+      std::tuple<UiElementName, int>(kOverflowMenuCloseAllIncognitoTabsItem,
+       IDS_VR_MENU_CLOSE_INCOGNITO_TABS),
+      std::tuple<UiElementName, int>(kOverflowMenuNewIncognitoTabItem, IDS_VR_MENU_NEW_INCOGNITO_TAB),
   };
 
   for (auto& item : menu_items) {
--- chromium-67.0.3396.48/components/url_formatter/idn_spoof_checker.cc.gcc5	2018-05-16 21:10:27.000000000 +0200
+++ chromium-67.0.3396.48/components/url_formatter/idn_spoof_checker.cc	2018-05-20 11:41:49.293953783 +0200
@@ -322,7 +322,7 @@
   if ((u04cf_pos = host.indexOf(0x4CF)) != -1) {
     icu::UnicodeString host_alt(host);
     size_t length = host_alt.length();
-    char16_t* buffer = host_alt.getBuffer(-1);
+    char16_t* buffer = (char16_t *)host_alt.getBuffer(-1);
     for (char16_t* uc = buffer + u04cf_pos ; uc < buffer + length; ++uc) {
       if (*uc == 0x4CF)
         *uc = 0x6C;  // Lowercase L
--- chromium-67.0.3396.48/content/browser/webui/web_ui_impl.cc.gcc5	2018-05-20 12:17:39.973307367 +0200
+++ chromium-67.0.3396.48/content/browser/webui/web_ui_impl.cc	2018-05-20 12:17:57.593306948 +0200
@@ -249,7 +249,7 @@
 
 void WebUIImpl::RegisterMessageCallback(base::StringPiece message,
                                         const MessageCallback& callback) {
-  message_callbacks_.emplace(message, callback);
+  message_callbacks_.emplace(message.as_string(), callback);
 }
 
 void WebUIImpl::ProcessWebUIMessage(const GURL& source_url,