mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-24 07:02:48 +00:00
Updated to 63.0.3239.132
This commit is contained in:
Алзим
parent
e5d6578135
commit
5ea0b36ba8
10 changed files with 154 additions and 101 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,5 +1,5 @@
|
|||
sources:
|
||||
chromium-62.0.3202.94.tar.xz: ee980a4098dfddad852b962046a0c39d9d1ee1d3
|
||||
chromium-63.0.3239.132.tar.xz: 2391ccd0a7b78489fe303a21b9c7fcb6781df519
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@ diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h26
|
|||
+#include <libavutil/imgutils.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/api/video/i420_buffer.h"
|
||||
#include "api/video/i420_buffer.h"
|
||||
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
|
||||
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-23 18:55:39.080894319 +0100
|
||||
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-23 18:54:32.178123691 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
||||
#include "modules/video_coding/codecs/h264/include/h264.h"
|
||||
|
||||
extern "C" {
|
||||
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
|
||||
+#include <libavcodec/avcodec.h>
|
||||
} // extern "C"
|
||||
|
||||
#include "webrtc/common_video/h264/h264_bitstream_parser.h"
|
||||
#include "common_video/h264/h264_bitstream_parser.h"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,15 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/BUILD.gn.pdfium-system-libtiff
|
|||
"PNG_PREFIX",
|
||||
"PNG_USE_READ_MACROS",
|
||||
]
|
||||
@@ -663,6 +663,7 @@
|
||||
@@ -668,6 +667,7 @@
|
||||
deps = [
|
||||
":fxcrt",
|
||||
"third_party:lcms2",
|
||||
+ "third_party:fx_libopenjpeg",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -685,6 +685,7 @@
|
||||
configs += [ ":pdfium_core_config" ]
|
||||
deps = [
|
||||
":fxcrt",
|
||||
|
|
@ -58,10 +66,10 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiff
|
|||
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
|
||||
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.pdfium-system-libtiff-libpng 2017-06-24 00:05:50.526671809 +0200
|
||||
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h 2017-06-25 12:29:14.039984794 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <vector>
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "core/fxcrt/cfx_unowned_ptr.h"
|
||||
#include "core/fxcodec/codec/codec_int.h"
|
||||
#include "core/fxcrt/unowned_ptr.h"
|
||||
-#include "third_party/libopenjpeg20/openjpeg.h"
|
||||
+#include <openjpeg.h>
|
||||
|
||||
|
|
@ -70,9 +78,9 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decode
|
|||
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h
|
||||
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
|
||||
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h 2017-06-24 00:05:50.521671902 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include "core/fxcodec/fx_codec.h"
|
||||
#include "core/fxcodec/jbig2/JBig2_Context.h"
|
||||
-#include "third_party/libopenjpeg20/openjpeg.h"
|
||||
+#include <openjpeg.h>
|
||||
|
|
@ -82,7 +90,7 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h
|
|||
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
|
||||
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
|
||||
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2017-06-24 00:26:21.330902789 +0200
|
||||
@@ -17,8 +17,12 @@
|
||||
@@ -16,8 +16,12 @@
|
||||
#include "core/fxcrt/fx_memory.h"
|
||||
#include "core/fxcrt/fx_safe_types.h"
|
||||
#include "third_party/base/ptr_util.h"
|
||||
|
|
@ -95,29 +103,21 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jp
|
|||
+extern void opj_free(void *);
|
||||
+}
|
||||
|
||||
#if defined(USE_SYSTEM_LCMS2)
|
||||
#include <lcms2.h>
|
||||
@@ -518,7 +518,7 @@
|
||||
image = nullptr;
|
||||
namespace {
|
||||
|
||||
@@ -484,7 +488,7 @@
|
||||
m_Image = nullptr;
|
||||
return false;
|
||||
}
|
||||
- image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
+// image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
- m_Image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
+// m_Image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
|
||||
if (!parameters.nb_tile_to_decode) {
|
||||
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
|
||||
if (!m_Parameters.nb_tile_to_decode) {
|
||||
if (!opj_set_decode_area(m_Codec, m_Image, m_Parameters.DA_x0,
|
||||
diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn
|
||||
--- chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
|
||||
+++ chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn 2017-06-24 22:25:18.901585830 +0200
|
||||
@@ -5,6 +5,7 @@
|
||||
import("//build/config/arm.gni")
|
||||
import("//build_overrides/build.gni")
|
||||
import("../pdfium.gni")
|
||||
+import("//build/config/linux/pkg_config.gni")
|
||||
|
||||
group("third_party") {
|
||||
deps = [
|
||||
@@ -351,164 +352,33 @@ group("lcms2") {
|
||||
@@ -354,164 +354,33 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -155,11 +155,11 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
|
|||
- "libopenjpeg20/openjpeg.c",
|
||||
- "libopenjpeg20/opj_clock.c",
|
||||
- "libopenjpeg20/pi.c",
|
||||
- "libopenjpeg20/raw.c",
|
||||
- "libopenjpeg20/t1.c",
|
||||
- "libopenjpeg20/t2.c",
|
||||
- "libopenjpeg20/tcd.c",
|
||||
- "libopenjpeg20/tgt.c",
|
||||
- "libopenjpeg20/thread.c",
|
||||
+pkg_config("openjpeg_config") {
|
||||
+ packages = [
|
||||
+ "libopenjp2",
|
||||
|
|
|
|||
|
|
@ -23,45 +23,14 @@
|
|||
ReleaseReservedMemory(allocation_base_, allocation_length_);
|
||||
return;
|
||||
}
|
||||
--- chromium-61.0.3163.59/third_party/WebKit/Source/core/events/WebInputEventConversion.cpp.bak 2017-08-23 21:06:12.000000000 +0200
|
||||
+++ chromium-61.0.3163.59/third_party/WebKit/Source/core/events/WebInputEventConversion.cpp 2017-08-29 12:55:47.529674979 +0200
|
||||
@@ -59,13 +59,11 @@
|
||||
}
|
||||
|
||||
FloatPoint FrameTranslation(const LocalFrameView* frame_view) {
|
||||
- float scale = 1;
|
||||
IntPoint visual_viewport;
|
||||
FloatSize overscroll_offset;
|
||||
if (frame_view) {
|
||||
LocalFrameView* root_view = frame_view->GetFrame().LocalFrameRoot().View();
|
||||
if (root_view) {
|
||||
- scale = root_view->InputEventsScaleFactor();
|
||||
visual_viewport = FlooredIntPoint(
|
||||
root_view->GetPage()->GetVisualViewport().VisibleRect().Location());
|
||||
overscroll_offset =
|
||||
--- chromium-61.0.3163.59/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.bak 2017-08-23 21:08:14.000000000 +0200
|
||||
+++ chromium-61.0.3163.59/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-29 13:07:50.789475942 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "webrtc/modules/audio_processing/aec3/aec_state.h"
|
||||
#include "modules/audio_processing/aec3/aec_state.h"
|
||||
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
--- chromium-61.0.3163.59/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp.bak 2017-08-23 21:06:12.000000000 +0200
|
||||
+++ chromium-61.0.3163.59/third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp 2017-08-29 15:01:43.565862171 +0200
|
||||
@@ -435,8 +435,10 @@
|
||||
WTF::SetSystemPagesInaccessible(data, length);
|
||||
return;
|
||||
case Protection::kReadWrite:
|
||||
- (void)WTF::SetSystemPagesAccessible(data, length);
|
||||
- return;
|
||||
+ if (WTF::SetSystemPagesAccessible(data, length))
|
||||
+ {
|
||||
+ return;
|
||||
+ }
|
||||
default:
|
||||
NOTREACHED();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
--- chromium-62.0.3202.9/tools/gn/bootstrap/bootstrap.py.gn-bootstrap 2017-09-06 21:06:55.000000000 +0200
|
||||
+++ chromium-62.0.3202.9/tools/gn/bootstrap/bootstrap.py 2017-09-11 01:20:05.698807248 +0200
|
||||
@@ -457,6 +457,7 @@
|
||||
'base/message_loop/message_pump_default.cc',
|
||||
'base/metrics/bucket_ranges.cc',
|
||||
'base/metrics/field_trial.cc',
|
||||
+ 'base/metrics/field_trial_params.cc',
|
||||
'base/metrics/field_trial_param_associator.cc',
|
||||
'base/metrics/histogram.cc',
|
||||
'base/metrics/histogram_base.cc',
|
||||
@@ -507,6 +508,7 @@
|
||||
'base/task_scheduler/scheduler_lock_impl.cc',
|
||||
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
|
||||
'base/task_scheduler/scheduler_worker.cc',
|
||||
+ 'base/task_scheduler/scheduler_worker_pool.cc',
|
||||
'base/task_scheduler/scheduler_worker_pool_impl.cc',
|
||||
'base/task_scheduler/scheduler_worker_pool_params.cc',
|
||||
'base/task_scheduler/scheduler_worker_stack.cc',
|
||||
@@ -523,6 +525,7 @@
|
||||
'base/third_party/icu/icu_utf.cc',
|
||||
'base/third_party/nspr/prtime.cc',
|
||||
'base/threading/post_task_and_reply_impl.cc',
|
||||
+ 'base/threading/scoped_blocking_call.cc',
|
||||
'base/threading/sequence_local_storage_map.cc',
|
||||
'base/threading/sequenced_task_runner_handle.cc',
|
||||
'base/threading/sequenced_worker_pool.cc',
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonBitArray.h-orig
|
||||
+++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonBitArray.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#define FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
|
||||
#include <stdint.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdlib>
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
--- 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 <stdint.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdlib>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
--- 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 <stdint.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdlib>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
--- 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 <stdint.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdlib>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
--- 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 <stdint.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdlib>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 62.0.3202.94
|
||||
Version: 63.0.3239.132
|
||||
Release: 1
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
|
|
@ -63,7 +63,6 @@ Patch35: chromium-50-system-ffmpeg-3.patch
|
|||
Patch36: chromium-58-glib.patch
|
||||
# clang builtin subtract functions, scoped enum
|
||||
Patch47: chromium-61-gcc5.patch
|
||||
Patch50: chromium-62-gn-bootstrap2.patch
|
||||
|
||||
# New from Debian
|
||||
Patch500: chromium-third-party-cookies-off-by-default.patch
|
||||
|
|
@ -85,8 +84,11 @@ Patch507: issue1688073002_40001.diff
|
|||
Patch600: chromium-buildname-60.0.3112.90.patch
|
||||
# Patch to fix build
|
||||
Patch601: chromium-62-include-cstdlib.patch
|
||||
|
||||
# From gentoo
|
||||
Patch602: chromium-gcc5-r3.patch
|
||||
Patch602: chromium-gcc5-r4.patch
|
||||
Patch603: chromium-gcc5-r5.patch
|
||||
Patch604: chromium-webrtc-r0.patch
|
||||
|
||||
Provides: %{crname} = %{EVRD}
|
||||
Conflicts: chromium-browser-unstable
|
||||
|
|
@ -201,7 +203,6 @@ your profile before changing channels.
|
|||
%{_crdir}/themes
|
||||
%{_crdir}/default_apps
|
||||
%dir %{_crdir}/pepper
|
||||
%{_mandir}/man1/%{crname}*
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_iconsdir}/hicolor/*/apps/chromium*
|
||||
%{_docdir}/%{name}/README.urpmi
|
||||
|
|
@ -270,7 +271,6 @@ members of the Chromium and WebDriver teams.
|
|||
%endif
|
||||
%patch36 -p1
|
||||
%patch47 -p1
|
||||
%patch50 -p1
|
||||
|
||||
# new from debian
|
||||
%patch500 -p1
|
||||
|
|
@ -289,6 +289,8 @@ members of the Chromium and WebDriver teams.
|
|||
%patch600 -p1
|
||||
%patch601 -p1
|
||||
%patch602 -p1
|
||||
%patch603 -p1
|
||||
%patch604 -p1 -b .webrtc
|
||||
|
||||
# files we do not want from upstream source bundles
|
||||
rm -rf breakpad/src/processor/testdata/
|
||||
|
|
@ -374,7 +376,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
|
|||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
||||
|
||||
%build
|
||||
%define system_gn_list ffmpeg flac harfbuzz-ng libxslt snappy yasm libpng zlib jsoncpp freetype
|
||||
%define system_gn_list ffmpeg flac libxslt snappy yasm libpng zlib jsoncpp freetype
|
||||
# opus
|
||||
# icu
|
||||
# libevent
|
||||
|
|
@ -382,6 +384,7 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
|||
# libwebp
|
||||
# System libxml must be built with icu support to be used in Chromium
|
||||
# libxml
|
||||
# handled by upstream regular build scripts? : freetype harfbuzz-ng
|
||||
|
||||
%if %{mdvver} >= 201610
|
||||
%define use_gold false
|
||||
|
|
@ -419,6 +422,8 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
|||
use_libpci = true \
|
||||
is_debug=false \
|
||||
is_clang=false \
|
||||
use_system_freetype=true \
|
||||
use_system_harfbuzz=true \
|
||||
google_api_key="%{google_api_key}" \
|
||||
google_default_client_id="%{google_default_client_id}" \
|
||||
google_default_client_secret="%{google_default_client_secret}"
|
||||
|
|
@ -438,7 +443,7 @@ CFLAGS=$(echo "$CFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments/
|
|||
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"
|
||||
CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow -Wno-error=deprecated-declarations"
|
||||
|
||||
python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
|
||||
|
||||
|
|
@ -453,12 +458,10 @@ mkdir -p %{buildroot}%{_bindir}
|
|||
mkdir -p %{buildroot}%{_crdir}/locales
|
||||
mkdir -p %{buildroot}%{_crdir}/themes
|
||||
mkdir -p %{buildroot}%{_crdir}/default_apps
|
||||
mkdir -p %{buildroot}%{_mandir}/man1
|
||||
install -m 755 %{SOURCE1} %{buildroot}%{_crdir}/chromium-wrapper
|
||||
install -m 755 out/Release/chrome %{buildroot}%{_crdir}/
|
||||
install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_crdir}/chrome-sandbox
|
||||
cp -a out/Release/chromedriver %{buildroot}%{_crdir}/chromedriver
|
||||
install -m 644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/%{crname}.1
|
||||
install -m 644 out/Release/*.pak %{buildroot}%{_crdir}/
|
||||
install -m 644 out/Release/icudtl.dat %{buildroot}%{_crdir}/
|
||||
cp -a out/Release/*_blob.bin %{buildroot}%{_crdir}/
|
||||
|
|
|
|||
62
chromium-gcc5-r4.patch
Normal file
62
chromium-gcc5-r4.patch
Normal file
|
|
@ -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<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
|
||||
@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
|
||||
static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
|
||||
const viz::TextureDrawQuad* quad =
|
||||
viz::TextureDrawQuad::MaterialCast(&input);
|
||||
- return quad->vertex_opacity;
|
||||
+ return base::make_span(quad->vertex_opacity);
|
||||
}
|
||||
|
||||
static bool y_flipped(const viz::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();
|
||||
}
|
||||
}
|
||||
|
||||
11
chromium-gcc5-r5.patch
Normal file
11
chromium-gcc5-r5.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/third_party/WebKit/public/web/WebFrameClient.h
|
||||
+++ b/third_party/WebKit/public/web/WebFrameClient.h
|
||||
@@ -507,7 +507,7 @@
|
||||
// Returns string to be used as a frame id in the devtools protocol.
|
||||
// It is derived from the content's devtools_frame_token, is
|
||||
// defined by the browser and passed into Blink upon frame creation.
|
||||
- virtual WebString GetInstrumentationToken() { return ""; }
|
||||
+ virtual WebString GetInstrumentationToken() { return WebString(); }
|
||||
|
||||
// PlzNavigate
|
||||
// Called to abort a navigation that is being handled by the browser process.
|
||||
34
chromium-webrtc-r0.patch
Normal file
34
chromium-webrtc-r0.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
|
||||
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||
Date: Fri, 13 Oct 2017 15:49:32 +0200
|
||||
Subject: [PATCH] IWYU: Include math.h for round(3).
|
||||
|
||||
math.h was being implicitly included, which can break the build with
|
||||
alternative libc implementations.
|
||||
|
||||
Bug: None
|
||||
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
|
||||
Reviewed-on: https://webrtc-review.googlesource.com/9384
|
||||
Reviewed-by: Tommi <tommi@webrtc.org>
|
||||
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
|
||||
Cr-Commit-Position: refs/heads/master@{#20292}
|
||||
---
|
||||
p2p/base/port.cc | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
|
||||
index a1b478d11..81aa0aadb 100644
|
||||
--- a/third_party/webrtc/p2p/base/port.cc
|
||||
+++ b/third_party/webrtc/p2p/base/port.cc
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
#include "p2p/base/port.h"
|
||||
|
||||
+#include <math.h>
|
||||
+
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
--
|
||||
2.15.0.rc2
|
||||
|
||||
Loading…
Add table
Reference in a new issue