1 |
commit: 28b1a2b3ae019a1267b233d3ef559d2081d8858b |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Feb 15 18:21:46 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 22:40:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b1a2b3 |
7 |
|
8 |
www-client/chromium: remove unused patches |
9 |
|
10 |
www-client/chromium/files/chromium-clang-r1.patch | 21 ----- |
11 |
www-client/chromium/files/chromium-gcc5-r4.patch | 98 ----------------------- |
12 |
www-client/chromium/files/chromium-gcc5-r5.patch | 11 --- |
13 |
3 files changed, 130 deletions(-) |
14 |
|
15 |
diff --git a/www-client/chromium/files/chromium-clang-r1.patch b/www-client/chromium/files/chromium-clang-r1.patch |
16 |
deleted file mode 100644 |
17 |
index 0fef167566a..00000000000 |
18 |
--- a/www-client/chromium/files/chromium-clang-r1.patch |
19 |
+++ /dev/null |
20 |
@@ -1,21 +0,0 @@ |
21 |
---- a/build/config/compiler/BUILD.gn.orig 2017-10-04 08:50:15.014675936 +0000 |
22 |
-+++ b/build/config/compiler/BUILD.gn 2017-10-04 08:50:32.831024327 +0000 |
23 |
-@@ -429,18 +429,6 @@ |
24 |
- cflags += [ "-fcolor-diagnostics" ] |
25 |
- } |
26 |
- |
27 |
-- # TODO(hans): Remove this once Clang generates better optimized debug info by |
28 |
-- # default. https://crbug.com/765793 |
29 |
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain && |
30 |
-- target_os != "chromeos") { |
31 |
-- cflags += [ |
32 |
-- "-Xclang", |
33 |
-- "-mllvm", |
34 |
-- "-Xclang", |
35 |
-- "-instcombine-lower-dbg-declare=1", |
36 |
-- ] |
37 |
-- } |
38 |
-- |
39 |
- # Print absolute paths in diagnostics. There is no precedent for doing this |
40 |
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
41 |
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
42 |
|
43 |
diff --git a/www-client/chromium/files/chromium-gcc5-r4.patch b/www-client/chromium/files/chromium-gcc5-r4.patch |
44 |
deleted file mode 100644 |
45 |
index cb978d58a06..00000000000 |
46 |
--- a/www-client/chromium/files/chromium-gcc5-r4.patch |
47 |
+++ /dev/null |
48 |
@@ -1,98 +0,0 @@ |
49 |
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
50 |
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
51 |
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { |
52 |
- allocation_length_(0), |
53 |
- data_(data), |
54 |
- data_length_(0), |
55 |
-- kind_(AllocationKind::kNormal), |
56 |
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), |
57 |
- deleter_(deleter) {} |
58 |
- DataHandle(void* allocation_base, |
59 |
- size_t allocation_length, |
60 |
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { |
61 |
- reinterpret_cast<uintptr_t>(allocation_base_) + |
62 |
- allocation_length_); |
63 |
- switch (kind_) { |
64 |
-- case AllocationKind::kNormal: |
65 |
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal: |
66 |
- DCHECK(deleter_); |
67 |
- deleter_(data_); |
68 |
- return; |
69 |
-- case AllocationKind::kReservation: |
70 |
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation: |
71 |
- ReleaseReservedMemory(allocation_base_, allocation_length_); |
72 |
- return; |
73 |
- } |
74 |
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 |
75 |
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 |
76 |
-@@ -10,7 +10,7 @@ |
77 |
- |
78 |
- #include "webrtc/modules/audio_processing/aec3/aec_state.h" |
79 |
- |
80 |
--#include <math.h> |
81 |
-+#include <cmath> |
82 |
- #include <numeric> |
83 |
- #include <vector> |
84 |
- |
85 |
---- a/gpu/ipc/common/mailbox_struct_traits.h |
86 |
-+++ b/gpu/ipc/common/mailbox_struct_traits.h |
87 |
-@@ -15,7 +15,7 @@ namespace mojo { |
88 |
- template <> |
89 |
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { |
90 |
- static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { |
91 |
-- return mailbox.name; |
92 |
-+ return base::make_span(mailbox.name); |
93 |
- } |
94 |
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); |
95 |
- }; |
96 |
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
97 |
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
98 |
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { |
99 |
- static base::span<const float> matrix(const cc::FilterOperation& operation) { |
100 |
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX) |
101 |
- return base::span<const float>(); |
102 |
-- return operation.matrix(); |
103 |
-+ return base::make_span(operation.matrix()); |
104 |
- } |
105 |
- |
106 |
- static base::span<const gfx::Rect> shape( |
107 |
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h |
108 |
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h |
109 |
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> { |
110 |
- static base::span<const float> vertex_opacity(const viz::DrawQuad& input) { |
111 |
- const viz::TextureDrawQuad* quad = |
112 |
- viz::TextureDrawQuad::MaterialCast(&input); |
113 |
-- return quad->vertex_opacity; |
114 |
-+ return base::make_span(quad->vertex_opacity); |
115 |
- } |
116 |
- |
117 |
- static bool y_flipped(const viz::DrawQuad& input) { |
118 |
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
119 |
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
120 |
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString( |
121 |
- } |
122 |
- default: |
123 |
- NOTREACHED(); |
124 |
-- return ""; |
125 |
-+ return WebString(); |
126 |
- } |
127 |
- } |
128 |
- |
129 |
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, |
130 |
- } |
131 |
- default: |
132 |
- NOTREACHED(); |
133 |
-- return ""; |
134 |
-+ return WebString(); |
135 |
- } |
136 |
- } |
137 |
- |
138 |
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, |
139 |
- } |
140 |
- default: |
141 |
- NOTREACHED(); |
142 |
-- return ""; |
143 |
-+ return WebString(); |
144 |
- } |
145 |
- } |
146 |
- |
147 |
|
148 |
diff --git a/www-client/chromium/files/chromium-gcc5-r5.patch b/www-client/chromium/files/chromium-gcc5-r5.patch |
149 |
deleted file mode 100644 |
150 |
index a07b973d8c0..00000000000 |
151 |
--- a/www-client/chromium/files/chromium-gcc5-r5.patch |
152 |
+++ /dev/null |
153 |
@@ -1,11 +0,0 @@ |
154 |
---- a/third_party/WebKit/public/web/WebFrameClient.h |
155 |
-+++ b/third_party/WebKit/public/web/WebFrameClient.h |
156 |
-@@ -507,7 +507,7 @@ |
157 |
- // Returns string to be used as a frame id in the devtools protocol. |
158 |
- // It is derived from the content's devtools_frame_token, is |
159 |
- // defined by the browser and passed into Blink upon frame creation. |
160 |
-- virtual WebString GetInstrumentationToken() { return ""; } |
161 |
-+ virtual WebString GetInstrumentationToken() { return WebString(); } |
162 |
- |
163 |
- // PlzNavigate |
164 |
- // Called to abort a navigation that is being handled by the browser process. |