Commit ba736150 authored by Michael Gilbert's avatar Michael Gilbert

refresh patches for chromium 61

parent fce12bcb
......@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -824,8 +824,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -836,8 +836,6 @@ void StartupBrowserCreatorImpl::AddInfoB
!command_line_.HasSwitch(switches::kTestType) &&
!command_line_.HasSwitch(switches::kEnableAutomation)) {
chrome::ShowBadFlagsPrompt(browser);
......
......@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller@canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -79,7 +79,7 @@ void CookieSettings::GetCookieSettings(
@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
......
description: fix variable name error when using system libatk
--- a/content/browser/accessibility/browser_accessibility_auralinux.cc
+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc
@@ -571,7 +571,7 @@ static AtkStateSet* browser_accessibilit
// it's best to leave this out rather than break people's builds:
#if defined(ATK_CHECK_VERSION)
#if ATK_CHECK_VERSION(2, 16, 0)
- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
#endif
#endif
break;
description: forward declare method that is defined after it is used
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
+++ b/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h
@@ -685,6 +685,8 @@ inline LinkedHashSet<T, U, V, W>& Linked
return *this;
}
+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
+
template <typename T, typename U, typename V, typename W>
inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
impl_.swap(other.impl_);
description: fix mojo layout test build error
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -39,7 +39,6 @@
#include "content/shell/common/shell_messages.h"
#include "content/shell/common/shell_switches.h"
#include "content/shell/grit/shell_resources.h"
-#include "content/test/data/mojo_layouttest_test.mojom.h"
#include "media/mojo/features.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/ssl/client_cert_identity.h"
@@ -128,26 +127,6 @@ int GetCrashSignalFD(const base::Command
}
#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-class MojoLayoutTestHelper : public mojom::MojoLayoutTestHelper {
- public:
- MojoLayoutTestHelper() {}
- ~MojoLayoutTestHelper() override {}
-
- // mojom::MojoLayoutTestHelper:
- void Reverse(const std::string& message, ReverseCallback callback) override {
- std::move(callback).Run(std::string(message.rbegin(), message.rend()));
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MojoLayoutTestHelper);
-};
-
-void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
- RenderFrameHost* render_frame_host) {
- mojo::MakeStrongBinding(base::MakeUnique<MojoLayoutTestHelper>(),
- std::move(request));
-}
-
} // namespace
ShellContentBrowserClient* ShellContentBrowserClient::Get() {
@@ -162,7 +141,6 @@ ShellContentBrowserClient::ShellContentB
: shell_browser_main_parts_(NULL) {
DCHECK(!g_browser_client);
g_browser_client = this;
- frame_interfaces_.AddInterface(base::Bind(&BindLayoutTestHelper));
}
ShellContentBrowserClient::~ShellContentBrowserClient() {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -237,9 +237,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
- "//content/test:content_test_mojo_bindings",
"//content/test:layouttest_support",
- "//content/test:mojo_layouttest_bindings",
"//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:fake_bluetooth",
......@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog(
@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
......
......@@ -27,7 +27,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "arm"
current_os = "linux"
@@ -95,6 +105,10 @@ gcc_toolchain("x86") {
@@ -103,6 +113,10 @@ gcc_toolchain("x86") {
# Output linker map files for binary size analysis.
enable_linker_map = true
......@@ -38,7 +38,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "x86"
current_os = "linux"
@@ -140,6 +154,10 @@ gcc_toolchain("x64") {
@@ -156,6 +170,10 @@ gcc_toolchain("x64") {
# Output linker map files for binary size analysis.
enable_linker_map = true
......
......@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert@debian.org>
options, args = parser.parse_args(argv)
if args:
@@ -200,6 +201,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -199,6 +200,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
......
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -534,7 +534,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/trace_event/heap_profiler_allocation_context_tracker.cc',
'base/trace_event/heap_profiler_allocation_register.cc',
'base/trace_event/heap_profiler_event_filter.cc',
- 'base/trace_event/heap_profiler_event_writer.cc',
+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
'base/trace_event/heap_profiler_serialization_state.cc',
'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
'base/trace_event/heap_profiler_type_name_deduplicator.cc',
description: safe math implementation does not yet support gcc
origin: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-gcc-r1.patch
--- a/base/numerics/safe_math_shared_impl.h
+++ b/base/numerics/safe_math_shared_impl.h
@@ -21,8 +21,7 @@
#if !defined(__native_client__) && \
((defined(__clang__) && \
((__clang_major__ > 3) || \
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
- (defined(__GNUC__) && __GNUC__ >= 5))
+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
#include "base/numerics/safe_math_clang_gcc_impl.h"
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
#else
description: add file needed to build gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -490,6 +490,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/sys_info.cc',
'base/task_runner.cc',
'base/task_scheduler/delayed_task_manager.cc',
+ 'base/task_scheduler/environment_config.cc',
'base/task_scheduler/post_task.cc',
'base/task_scheduler/priority_queue.cc',
'base/task_scheduler/scheduler_lock_impl.cc',
manpage.patch
master-preferences.patch
gn/profiler.patch
gn/safemath.patch
gn/parallel.patch
gn/buildflags.patch
gn/scheduler.patch
disable/promo.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
fixes/atk.patch
fixes/mojo.patch
fixes/ps-print.patch
fixes/gpu-timeout.patch
fixes/declaration.patch
fixes/widevine-revision.patch
fixes/chromedriver-revision.patch
......@@ -19,5 +23,4 @@ system/icu.patch
system/vpx.patch
system/nspr.patch
system/event.patch
system/libxml.patch
system/gtk2.patch
description: build using system libevent
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/base/task_queue_libevent.cc
+++ b/third_party/webrtc/base/task_queue_libevent.cc
--- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
+++ b/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -15,7 +15,7 @@
#include <string.h>
#include <unistd.h>
-#include "base/third_party/libevent/event.h"
+#include <event.h>
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/task_queue_posix.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/logging.h"
#include "webrtc/rtc_base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -609,26 +609,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -608,26 +608,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_now_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
......@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
@@ -660,13 +640,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -659,13 +639,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
......@@ -56,7 +56,7 @@ author: Michael Gilbert <mgilbert@debian.org>
else:
libs.extend(['-lrt'])
static_libraries['base']['sources'].extend([
@@ -703,12 +677,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -702,12 +676,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
])
......
description: don't use ffmpeg's private API, which can change at any time.
author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -26,7 +26,6 @@ extern "C" {
// Disable deprecated features which result in spammy compile warnings. This
// list of defines must mirror those in the 'defines' section of FFmpeg's
// BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
@@ -40,7 +39,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
......@@ -3,8 +3,8 @@ origin: implementation from chromium 59.0.3071.86
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -315,13 +315,55 @@ gfx::FontRenderParams GetGtkFontRenderPa
return params;
@@ -1048,12 +1048,54 @@ void GtkUi::ResetStyle() {
native_theme_->NotifyObservers();
}
+float GtkDpiToScaleFactor(int dpi) {
......@@ -40,7 +40,7 @@ origin: implementation from chromium 59.0.3071.86
+ return GtkDpiToScaleFactor(gtk_dpi);
+}
+
float GetRawDeviceScaleFactor() {
float GtkUi::GetRawDeviceScaleFactor() {
if (display::Display::HasForceDeviceScaleFactor())
return display::Display::GetForcedDeviceScaleFactor();
......@@ -53,9 +53,8 @@ origin: implementation from chromium 59.0.3071.86
+ scale = 1;
+ }
+#else
gint scale = gdk_screen_get_monitor_scale_factor(
screen, gdk_screen_get_primary_monitor(screen));
gint scale = gtk_widget_get_scale_factor(fake_window_);
+#endif
gdouble resolution = gdk_screen_get_resolution(screen);
return resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
}
const float scale_factor =
resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -657,8 +657,7 @@ group("gn_all") {
@@ -680,8 +680,7 @@ group("gn_all") {
}
}
......
description: system libxml2 2.9.4 does not yet provide XML_PARSE_NOXXE
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/libxml/chromium/libxml_utils.cc
+++ b/third_party/libxml/chromium/libxml_utils.cc
@@ -24,8 +24,7 @@ XmlReader::~XmlReader() {
bool XmlReader::Load(const std::string& input) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
// TODO(evanm): Verify it's OK to pass NULL for the URL and encoding.
// The libxml code allows for these, but it's unclear what effect is has.
reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()),
@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string&
bool XmlReader::LoadFile(const std::string& file_path) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions);
return reader_ != NULL;
}
......@@ -30,10 +30,10 @@ author: Michael Gilbert <mgilbert@debian.org>
'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequence_local_storage_map.cc',
'base/threading/sequenced_task_runner_handle.cc',
@@ -661,7 +660,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -660,7 +659,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
......@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert@debian.org>
])
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -58,6 +58,9 @@ config("base_flags") {
@@ -53,6 +53,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
......@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -868,8 +871,6 @@ component("base") {
@@ -858,8 +861,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
......@@ -62,4 +62,4 @@ author: Michael Gilbert <mgilbert@debian.org>
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"third_party/valgrind/memcheck.h",
"threading/non_thread_safe.h",
"threading/platform_thread.h",
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -1076,9 +1076,6 @@ int VP8DecoderImpl::Decode(const Encoded
@@ -1078,9 +1078,6 @@ int VP8DecoderImpl::Decode(const Encoded
img = vpx_codec_get_frame(decoder_, &iter);
int qp;
......@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert@debian.org>
ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
if (ret != 0) {
// Reset to avoid requesting key frames too often.
@@ -1125,8 +1122,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
@@ -1127,8 +1124,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
decoded_image.set_ntp_time_ms(ntp_time_ms);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment