diff options
author | Eric Hameleers <alien@slackware.com> | 2017-10-20 09:50:03 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-10-20 09:50:03 +0000 |
commit | 1527c0c704c374c287a230deb0de4d4c4d4dcb9f (patch) | |
tree | 3b5aa8eff1680999bf455df6f7588e5c822eb87e | |
parent | dc48ac34b79b81c4bb95836ddad305be1a9b2eca (diff) | |
download | asb-1527c0c704c374c287a230deb0de4d4c4d4dcb9f.tar.gz asb-1527c0c704c374c287a230deb0de4d4c4d4dcb9f.tar.xz |
chromium: updated the gcc5 patch for chromium 62
-rw-r--r-- | chromium/build/patches/chromium_gcc5.patch | 94 |
1 files changed, 62 insertions, 32 deletions
diff --git a/chromium/build/patches/chromium_gcc5.patch b/chromium/build/patches/chromium_gcc5.patch index fc2219c0..7605df6b 100644 --- a/chromium/build/patches/chromium_gcc5.patch +++ b/chromium/build/patches/chromium_gcc5.patch @@ -1,35 +1,3 @@ -Fix build with gcc5 - https://bugs.gentoo.org/627414 - ---- a/chrome/browser/devtools/devtools_file_system_indexer.cc -+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc -@@ -34,7 +34,6 @@ using base::TimeDelta; - using base::TimeTicks; - using content::BrowserThread; - using std::map; --using std::set; - using std::string; - using std::vector; - -@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) { - if (trigram != kUndefinedTrigram) - trigrams.push_back(trigram); - } -- set<FileId> file_ids; -+ std::set<FileId> file_ids; - bool first = true; - vector<Trigram>::const_iterator it = trigrams.begin(); - for (; it != trigrams.end(); ++it) { -@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) { - first = false; - continue; - } -- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( -+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( - file_ids, index_[trigram]); - file_ids.swap(intersection); - } -diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -index 94bb9161ec85..e40c6387f72e 100644 --- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h @@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { @@ -66,3 +34,65 @@ index 94bb9161ec85..e40c6387f72e 100644 #include <numeric> #include <vector> +--- 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<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> 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<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::make_span(operation.matrix()); + } + + static base::span<const gfx::Rect> 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<const float> 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(); + } + } + |