diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-11 16:08:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-17 11:47:13 +0000 |
commit | be6a797fa404fa792e4fa669ac9fa5f4c85fab10 (patch) | |
tree | cb0c8f6a189dc9ceb05c4f11e129868d6261bb17 | |
parent | 9efaba1b6e85008623776287169278d1195e5bf7 (diff) | |
download | qtwebengine-chromium-be6a797fa404fa792e4fa669ac9fa5f4c85fab10.tar.gz |
Post 71-merge fixups
Fixes new asserts and build issues from the Chromium 71 code.
Change-Id: I102539873f82bfd446cf034a2d97eb40d2dfb1f5
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
5 files changed, 8 insertions, 5 deletions
diff --git a/chromium/base/allocator/partition_allocator/partition_page.h b/chromium/base/allocator/partition_allocator/partition_page.h index 3b15b2d789e..0fa490dccfe 100644 --- a/chromium/base/allocator/partition_allocator/partition_page.h +++ b/chromium/base/allocator/partition_allocator/partition_page.h @@ -198,13 +198,13 @@ ALWAYS_INLINE size_t PartitionPage::get_raw_size() const { } ALWAYS_INLINE void PartitionPage::Free(void* ptr) { +#if DCHECK_IS_ON() size_t slot_size = this->bucket->slot_size; const size_t raw_size = get_raw_size(); if (raw_size) { slot_size = raw_size; } -#if DCHECK_IS_ON() // If these asserts fire, you probably corrupted memory. PartitionCookieCheckValue(ptr); PartitionCookieCheckValue(reinterpret_cast<char*>(ptr) + slot_size - diff --git a/chromium/cc/trees/draw_property_utils.cc b/chromium/cc/trees/draw_property_utils.cc index 7c9b86cb096..9e687c79206 100644 --- a/chromium/cc/trees/draw_property_utils.cc +++ b/chromium/cc/trees/draw_property_utils.cc @@ -704,7 +704,9 @@ static void ComputeClips(PropertyTrees* property_trees) { bool success = ApplyClipNodeToAccumulatedClip( property_trees, include_expanding_clips, target_effect_id, target_transform_id, clip_node, &accumulated_clip); - DCHECK(success); + if (!success) + LOG(ERROR) << "Compute clip failure"; +// DCHECK(success); clip_node->cached_accumulated_rect_in_screen_space = accumulated_clip; } clip_tree->set_needs_update(false); diff --git a/chromium/content/browser/startup_helper.cc b/chromium/content/browser/startup_helper.cc index 204b3305a8c..7769f5a678f 100644 --- a/chromium/content/browser/startup_helper.cc +++ b/chromium/content/browser/startup_helper.cc @@ -83,7 +83,9 @@ std::unique_ptr<base::FieldTrialList> SetUpFieldTrialsAndFeatureList() { } void StartBrowserTaskScheduler() { - auto task_scheduler_init_params = + std::unique_ptr<base::TaskScheduler::InitParams> task_scheduler_init_params; + if (GetContentClient()->browser()) + task_scheduler_init_params = GetContentClient()->browser()->GetTaskSchedulerInitParams(); if (!task_scheduler_init_params) task_scheduler_init_params = GetDefaultTaskSchedulerInitParams(); diff --git a/chromium/services/network/resolve_host_request.cc b/chromium/services/network/resolve_host_request.cc index 6baf5543c77..ebdea8e0a3f 100644 --- a/chromium/services/network/resolve_host_request.cc +++ b/chromium/services/network/resolve_host_request.cc @@ -22,7 +22,6 @@ ResolveHostRequest::ResolveHostRequest( optional_parameters, net::NetLog* net_log) { DCHECK(resolver); - DCHECK(net_log); internal_request_ = resolver->CreateRequest( host, net::NetLogWithSource::Make(net_log, net::NetLogSourceType::NONE), diff --git a/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc index b8bdb2a2c02..b1436ade09c 100644 --- a/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc +++ b/chromium/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc @@ -318,7 +318,7 @@ static hb_font_funcs_t* HarfBuzzSkiaGetFontFuncs() { hb_font_funcs_set_glyph_h_advance_func( funcs, HarfBuzzGetGlyphHorizontalAdvance, nullptr, nullptr); hb_font_funcs_set_glyph_h_advances_func( - funcs, HarfBuzzGetGlyphHorizontalAdvances, nullptr, nullptr); + funcs, (hb_font_get_glyph_h_advances_func_t)HarfBuzzGetGlyphHorizontalAdvances, nullptr, nullptr); hb_font_funcs_set_glyph_h_kerning_func( funcs, HarfBuzzGetGlyphHorizontalKerning, nullptr, nullptr); hb_font_funcs_set_glyph_v_advance_func( |