From 06b2b959653a45729b92f17a3396c2e7c17f2fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Thu, 2 Nov 2017 05:09:14 +0300 Subject: [PATCH] Updated to 62.0.3202.75 --- .abf.yml | 2 +- chromium-54-proprietary-codecs-assert.patch | 13 +- chromium-55-extra-media.patch | 455 +++++++++--------- chromium-61-atk.patch | 11 - chromium-61-gcc5.patch | 63 --- chromium-61-gn-bootstrap.patch | 11 - ...1-Fix_compilation_failures_for_arm64.patch | 32 -- chromium-62-gn-bootstrap2.patch | 26 + chromium-62-include-cstdlib.patch | 54 +++ chromium-browser-stable.spec | 20 +- chromium-gcc5-r3.patch | 62 +++ 11 files changed, 393 insertions(+), 356 deletions(-) delete mode 100644 chromium-61-atk.patch delete mode 100644 chromium-61-gn-bootstrap.patch delete mode 100644 chromium-61.0.3163.91-Fix_compilation_failures_for_arm64.patch create mode 100644 chromium-62-gn-bootstrap2.patch create mode 100644 chromium-62-include-cstdlib.patch create mode 100644 chromium-gcc5-r3.patch diff --git a/.abf.yml b/.abf.yml index 100f77a..affb820 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: - chromium-61.0.3163.100.tar.xz: 1f79366ab95100349755e6f81769e913b47b7eb4 + chromium-62.0.3202.75.tar.xz: f56d827a7b6f6f2b94ae277b7fb9f7e009b22221 depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 diff --git a/chromium-54-proprietary-codecs-assert.patch b/chromium-54-proprietary-codecs-assert.patch index 0218543..56318ab 100644 --- a/chromium-54-proprietary-codecs-assert.patch +++ b/chromium-54-proprietary-codecs-assert.patch @@ -1,6 +1,7 @@ ---- chromium-54.0.2840.16/media/BUILD.gn.proprietary-codecs 2016-09-09 00:02:27.000000000 +0200 -+++ chromium-54.0.2840.16/media/BUILD.gn 2016-09-12 15:08:34.566096246 +0200 -@@ -23,12 +23,6 @@ +diff -up chromium-62.0.3192.0/media/BUILD.gn.proprietary-codecs chromium-62.0.3192.0/media/BUILD.gn +--- chromium-62.0.3192.0/media/BUILD.gn.proprietary-codecs 2017-08-30 16:13:04.296259457 +0200 ++++ chromium-62.0.3192.0/media/BUILD.gn 2017-08-30 16:18:23.778444612 +0200 +@@ -33,12 +33,6 @@ buildflag_header("media_features") { ] } @@ -10,6 +11,6 @@ - "proprietary codecs and ffmpeg_branding set to Chromium are incompatible") -} - - # Common configuration for targets in the media directory. - # NOT for exporting. - config("media_config") { + # Common configuration for targets in the media directory; these must not be + # exported since things like USE_NEON and USE_CRAS have different meanings + # elsewhere in the code base. diff --git a/chromium-55-extra-media.patch b/chromium-55-extra-media.patch index e8dfa17..5667df1 100644 --- a/chromium-55-extra-media.patch +++ b/chromium-55-extra-media.patch @@ -1,150 +1,7 @@ ---- chromium-52.0.2716.0/media/base/mime_util_internal.cc 2016-04-27 08:42:25.933047659 +0200 -+++ chromium-52.0.2716.0/media/base/mime_util_internal.cc 2016-12-03 22:43:46.182795570 +0100 -@@ -76,7 +76,11 @@ - {"flac", MimeUtil::FLAC}, - {"vp8", MimeUtil::VP8}, - {"vp8.0", MimeUtil::VP8}, -- {"theora", MimeUtil::THEORA} -+ {"theora", MimeUtil::THEORA}, -+ {"dts", MimeUtil::DTS}, -+ {"mp2", MimeUtil::MP2}, -+ {"mp4v.20.8", MimeUtil::MPEG4_SP}, -+ {"mp4v.20.240", MimeUtil::MPEG4_ASP} - }; - - return kStringToCodecMap; -@@ -142,6 +146,9 @@ - return kCodecTheora; - case MimeUtil::DOLBY_VISION: - return kCodecDolbyVision; -+ case MimeUtil::MPEG4_SP: -+ case MimeUtil::MPEG4_ASP: -+ return kCodecMPEG4; - default: - break; - } -@@ -234,6 +241,31 @@ - #endif // !defined(OS_ANDROID) - CodecSet ogg_codecs(ogg_audio_codecs); - ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end()); -+ -+ CodecSet matroska_audio_codecs; -+ matroska_audio_codecs.insert(OPUS); -+ matroska_audio_codecs.insert(VORBIS); -+ matroska_audio_codecs.insert(AC3); -+ matroska_audio_codecs.insert(EAC3); -+ matroska_audio_codecs.insert(DTS); -+ matroska_audio_codecs.insert(MP3); -+ matroska_audio_codecs.insert(MP2); -+ matroska_audio_codecs.insert(MPEG2_AAC); -+ matroska_audio_codecs.insert(MPEG4_AAC); -+ matroska_audio_codecs.insert(PCM); -+ -+ CodecSet matroska_video_codecs; -+ matroska_video_codecs.insert(THEORA); -+ matroska_video_codecs.insert(VP8); -+ matroska_video_codecs.insert(VP9); -+ matroska_video_codecs.insert(H264); -+ matroska_video_codecs.insert(MPEG4_SP); -+ matroska_video_codecs.insert(MPEG4_ASP); -+#if BUILDFLAG(ENABLE_HEVC_DEMUXING) -+ matroska_video_codecs.insert(HEVC); -+#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING) -+ CodecSet matroska_codecs(matroska_audio_codecs); -+ matroska_codecs.insert(matroska_video_codecs.begin(), matroska_video_codecs.end()); - - CodecSet webm_audio_codecs; - webm_audio_codecs.insert(OPUS); -@@ -264,6 +296,8 @@ - - CodecSet mp4_video_codecs; - mp4_video_codecs.insert(H264); -+ mp4_video_codecs.insert(MPEG4_SP); -+ mp4_video_codecs.insert(MPEG4_ASP); - #if BUILDFLAG(ENABLE_HEVC_DEMUXING) - mp4_video_codecs.insert(HEVC); - #endif // BUILDFLAG(ENABLE_HEVC_DEMUXING) -@@ -291,6 +325,9 @@ - AddContainerWithCodecs("application/ogg", ogg_codecs, false); - AddContainerWithCodecs("audio/flac", implicit_codec, false); - -+ AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false); -+ AddContainerWithCodecs("video/x-matroska", matroska_codecs, false); -+ - #if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". - AddContainerWithCodecs("audio/mp3", implicit_codec, true); -@@ -303,6 +340,7 @@ - // support the codecs needed for compatibility. - AddContainerWithCodecs("audio/x-m4a", aac, true); - AddContainerWithCodecs("video/x-m4v", avc_and_aac, true); -+ AddContainerWithCodecs("video/x-msvideo", matroska_codecs, true); - - #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) - // TODO(ddorwin): Exactly which codecs should be supported? -@@ -721,9 +759,13 @@ - case H264: - case HEVC: - case DOLBY_VISION: -+ case DTS: -+ case MPEG4_SP: -+ case MPEG4_ASP: - return true; - - case PCM: -+ case MP2: - case VORBIS: - case OPUS: - case FLAC: ---- chromium-52.0.2716.0/media/base/mime_util_internal.h.matroska-avi 2016-04-27 00:02:52.000000000 +0200 -+++ chromium-52.0.2716.0/media/base/mime_util_internal.h 2016-04-27 08:14:04.560330601 +0200 -@@ -42,7 +42,11 @@ - VP9, - THEORA, - DOLBY_VISION, -- LAST_CODEC = DOLBY_VISION -+ DTS, -+ MP2, -+ MPEG4_SP, -+ MPEG4_ASP, -+ LAST_CODEC = MPEG4_ASP - }; - - // Platform configuration structure. Controls which codecs are supported at ---- chromium-52.0.2716.0/net/base/mime_util.cc.matroska-avi 2016-04-27 00:02:52.000000000 +0200 -+++ chromium-52.0.2716.0/net/base/mime_util.cc 2016-04-27 08:14:04.561330581 +0200 -@@ -78,6 +78,9 @@ static const MimeInfo kPrimaryMappings[] - {"audio/webm", "webm"}, - {"audio/wav", "wav"}, - {"audio/flac", "flac"}, -+ {"video/x-matroska", "mkv"}, -+ {"audio/x-matroska", "mkv"}, -+ {"video/x-msvideo", "avi"}, - {"application/xhtml+xml", "xhtml,xht,xhtm"}, - {"application/x-chrome-extension", "crx"}, - {"multipart/related", "mhtml,mht"}}; -@@ -425,6 +428,7 @@ static const char* const kStandardAudioT - "audio/vorbis", - "audio/wav", - "audio/webm", -+ "audio/x-matroska", - "audio/x-m4a", - "audio/x-ms-wma", - "audio/vnd.rn-realaudio", -@@ -442,8 +446,10 @@ static const char* const kStandardVideoT - "video/webm", - "video/x-dv", - "video/x-m4v", -+ "video/x-matroska", - "video/x-mpeg", - "video/x-ms-asf", -+ "video/x-msvideo", - "video/x-ms-wmv" - }; - ---- chromium-51.0.2687.0/media/base/audio_codecs.cc.ac3-dts 2016-03-22 23:01:01.000000000 +0100 -+++ chromium-51.0.2687.0/media/base/audio_codecs.cc 2016-03-23 18:19:14.903959089 +0100 -@@ -43,6 +43,8 @@ std::string GetCodecName(AudioCodec code +diff -up chromium-62.0.3192.0/media/base/audio_codecs.cc.extra-media chromium-62.0.3192.0/media/base/audio_codecs.cc +--- chromium-62.0.3192.0/media/base/audio_codecs.cc.extra-media 2017-08-22 21:04:45.000000000 +0200 ++++ chromium-62.0.3192.0/media/base/audio_codecs.cc 2017-08-30 15:39:09.735186077 +0200 +@@ -44,6 +44,8 @@ std::string GetCodecName(AudioCodec code return "alac"; case kCodecAC3: return "ac3"; @@ -153,7 +10,7 @@ } NOTREACHED(); return ""; -@@ -72,6 +72,8 @@ +@@ -68,6 +70,8 @@ AudioCodec StringToAudioCodec(const std: return kCodecVorbis; if (base::StartsWith(codec_id, "mp4a.40.", base::CompareCase::SENSITIVE)) return kCodecAAC; @@ -162,8 +19,9 @@ return kUnknownAudioCodec; } ---- chromium-51.0.2687.0/media/base/audio_codecs.h.ac3-dts 2016-03-22 23:01:01.000000000 +0100 -+++ chromium-51.0.2687.0/media/base/audio_codecs.h 2016-03-23 18:18:33.765701074 +0100 +diff -up chromium-62.0.3192.0/media/base/audio_codecs.h.extra-media chromium-62.0.3192.0/media/base/audio_codecs.h +--- chromium-62.0.3192.0/media/base/audio_codecs.h.extra-media 2017-08-22 21:04:45.000000000 +0200 ++++ chromium-62.0.3192.0/media/base/audio_codecs.h 2017-08-30 15:39:09.735186077 +0200 @@ -32,13 +32,14 @@ enum AudioCodec { kCodecPCM_ALAW = 14, kCodecALAC = 15, @@ -180,77 +38,10 @@ }; std::string MEDIA_EXPORT GetCodecName(AudioCodec codec); ---- chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.ac3-dts 2016-03-22 23:01:01.000000000 +0100 -+++ chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc 2016-03-23 18:13:42.226118362 +0100 -@@ -117,6 +117,8 @@ static AudioCodec CodecIDToAudioCodec(AV - return kCodecOpus; - case AV_CODEC_ID_ALAC: - return kCodecALAC; -+ case AV_CODEC_ID_DTS: -+ return kCodecDTS; - default: - DVLOG(1) << "Unknown audio CodecID: " << codec_id; - } -@@ -168,6 +170,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec - return AV_CODEC_ID_PCM_MULAW; - case kCodecOpus: - return AV_CODEC_ID_OPUS; -+ case kCodecAC3: -+ return AV_CODEC_ID_AC3; -+ case kCodecDTS: -+ return AV_CODEC_ID_DTS; - default: - DVLOG(1) << "Unknown AudioCodec: " << audio_codec; - } ---- chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc.bak 2016-11-29 21:04:19.000000000 +0100 -+++ chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc 2016-12-01 23:42:15.717317808 +0100 -@@ -57,6 +57,7 @@ - CASE_RETURN_OTHER(kCodecPCM_ALAW); - CASE_RETURN_OTHER(kCodecALAC); - CASE_RETURN_OTHER(kCodecAC3); -+ CASE_RETURN_OTHER(kCodecDTS); - } - return base::nullopt; // Not a 'default' to ensure compile-time checks. - } -@@ -83,6 +83,7 @@ - CASE_RETURN_OTHER(kCodecPCM_ALAW); - CASE_RETURN_OTHER(kCodecALAC); - CASE_RETURN_OTHER(kCodecAC3); -+ CASE_RETURN_OTHER(kCodecDTS); - } - return base::nullopt; // Not a 'default' to ensure compile-time checks. - } ---- chromium-56.0.2924.10/media/remoting/rpc.proto.bak 2016-11-29 21:04:19.000000000 +0100 -+++ chromium-56.0.2924.10/media/remoting/rpc.proto 2016-12-02 02:15:05.660562641 +0100 -@@ -64,6 +64,7 @@ - kCodecPCM_ALAW = 14; - kCodecALAC = 15; - kCodecAC3 = 16; -+ kCodecDTS = 17; - } - - // Proto version of media::SampleFormat. ---- chromium-56.0.2924.21/media/filters/ffmpeg_video_decoder.cc.extra_media 2016-12-09 00:02:25.000000000 +0100 -+++ chromium-56.0.2924.21/media/filters/ffmpeg_video_decoder.cc 2016-12-10 20:33:18.005427356 +0100 -@@ -57,7 +57,6 @@ - case kUnknownVideoCodec: - case kCodecVC1: - case kCodecMPEG2: -- case kCodecHEVC: - case kCodecVP9: - case kCodecDolbyVision: - // We do not compile ffmpeg with support for any of these codecs. -@@ -70,6 +69,7 @@ - case kCodecH264: - case kCodecMPEG4: - case kCodecVP8: -+ case kCodecHEVC: - // Normalize to three threads for 1080p content, then scale linearly - // with number of pixels. - // Examples: ---- chromium-59.0.3071.86/media/base/decode_capabilities.cc.extra-media 2017-06-05 21:03:08.000000000 +0200 -+++ chromium-59.0.3071.86/media/base/decode_capabilities.cc 2017-06-06 06:40:15.679758574 +0200 -@@ -114,6 +114,9 @@ +diff -up chromium-62.0.3192.0/media/base/decode_capabilities.cc.extra-media chromium-62.0.3192.0/media/base/decode_capabilities.cc +--- chromium-62.0.3192.0/media/base/decode_capabilities.cc.extra-media 2017-08-22 21:04:45.000000000 +0200 ++++ chromium-62.0.3192.0/media/base/decode_capabilities.cc 2017-08-30 15:39:09.737186041 +0200 +@@ -146,6 +146,9 @@ bool IsSupportedAudioConfig(const AudioC case media::kCodecPCM_S24BE: case media::kCodecPCM_ALAW: case media::kCodecVorbis: @@ -260,7 +51,7 @@ return true; case media::kCodecAMR_NB: -@@ -125,9 +127,7 @@ +@@ -157,9 +160,7 @@ bool IsSupportedAudioConfig(const AudioC return false; #endif @@ -270,7 +61,7 @@ case media::kUnknownAudioCodec: return false; } -@@ -147,13 +147,13 @@ +@@ -179,13 +180,13 @@ bool IsSupportedVideoConfig(const VideoC case media::kCodecH264: case media::kCodecVP8: case media::kCodecTheora: @@ -286,3 +77,221 @@ case media::kCodecDolbyVision: return false; } +diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chromium-62.0.3192.0/media/base/mime_util_internal.cc +--- chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media 2017-08-22 21:04:45.000000000 +0200 ++++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 15:44:46.519076991 +0200 +@@ -73,6 +73,10 @@ const base::flat_map ToMediaAudioC + CASE_RETURN_OTHER(kCodecPCM_ALAW); + CASE_RETURN_OTHER(kCodecALAC); + CASE_RETURN_OTHER(kCodecAC3); ++ CASE_RETURN_OTHER(kCodecDTS); + } + return base::nullopt; // Not a 'default' to ensure compile-time checks. + } +@@ -83,6 +84,7 @@ base::Optional ++#include + + class CBC_CommonBitArray { + public: +--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonByteArray.h-orig ++++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonByteArray.h +@@ -8,6 +8,8 @@ + #define FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_ + + #include ++#include ++#include + + // TODO(weili): The usage of this class should be replaced by + // std::vector. +--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h-orig ++++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +@@ -8,6 +8,8 @@ + #define FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_ + + #include ++#include ++#include + + class CBC_BarcodeRow { + public: +--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h-orig ++++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h +@@ -8,6 +8,8 @@ + #define FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_ + + #include ++#include ++#include + + struct CBC_QRCoderECBlockData; + +--- chromium-62.0.3202.75/third_party/pdfium/xfa/fxfa/cxfa_texttabstopscontext.h-orig ++++ chromium-62.0.3202.75/third_party/pdfium/xfa/fxfa/cxfa_texttabstopscontext.h +@@ -8,6 +8,8 @@ + #define XFA_FXFA_CXFA_TEXTTABSTOPSCONTEXT_H_ + + #include ++#include ++#include + + struct XFA_TABSTOPS { + uint32_t dwAlign; diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 50235c4..23c832b 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -22,7 +22,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 61.0.3163.100 +Version: 62.0.3202.75 Release: 1 License: BSD, LGPL Group: Networking/WWW @@ -61,12 +61,9 @@ Patch32: chromium-55-extra-media.patch Patch35: chromium-50-system-ffmpeg-3.patch # (cjw) fix build with current glib... Patch36: chromium-58-glib.patch -# GN bootstrap broken again -Patch46: chromium-61-gn-bootstrap.patch # clang builtin subtract functions, scoped enum Patch47: chromium-61-gcc5.patch -# atk build problem -Patch48: chromium-61-atk.patch +Patch50: chromium-62-gn-bootstrap2.patch # New from Debian Patch500: chromium-third-party-cookies-off-by-default.patch @@ -86,8 +83,10 @@ Patch504: chromium-system-icu-r0.patch Patch507: issue1688073002_40001.diff # ROSA Build Patch600: chromium-buildname-60.0.3112.90.patch -# https://chromium.googlesource.com/chromium/src.git/+/63c4dc41d2b90dc3386e331b62ee893a32bb0b11%5E!/ -Patch601: chromium-61.0.3163.91-Fix_compilation_failures_for_arm64.patch +# Patch to fix build +Patch601: chromium-62-include-cstdlib.patch +# From gentoo +Patch602: chromium-gcc5-r3.patch Provides: %{crname} = %{EVRD} Conflicts: chromium-browser-unstable @@ -270,9 +269,8 @@ members of the Chromium and WebDriver teams. %patch35 -p1 %endif %patch36 -p1 -%patch46 -p1 %patch47 -p1 -%patch48 -p1 +%patch50 -p1 # new from debian %patch500 -p1 @@ -290,6 +288,7 @@ members of the Chromium and WebDriver teams. %patch600 -p1 %patch601 -p1 +%patch602 -p1 # files we do not want from upstream source bundles rm -rf breakpad/src/processor/testdata/ @@ -438,6 +437,9 @@ LD=%{__cxx}; export LD CFLAGS=$(echo "$CFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//') CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//') +CFLAGS="$CFLAGS -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast" +CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow" + python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}' out/Release/gn gen --args='%{gn_config}' out/Release diff --git a/chromium-gcc5-r3.patch b/chromium-gcc5-r3.patch new file mode 100644 index 0000000..c2ad7ae --- /dev/null +++ b/chromium-gcc5-r3.patch @@ -0,0 +1,62 @@ +--- 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(); + } + } +