fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327. Backports https://chromium-review.googlesource.com/802574.
This commit is contained in:
parent
cc53269231
commit
ae12d53884
3 changed files with 1308 additions and 16 deletions
|
@ -45,7 +45,6 @@ patches:
|
||||||
base/memory/weak_ptr.cc
|
base/memory/weak_ptr.cc
|
||||||
base/process/kill_win.cc
|
base/process/kill_win.cc
|
||||||
components/viz/service/display/program_binding.h
|
components/viz/service/display/program_binding.h
|
||||||
components/viz/service/display_embedder/server_shared_bitmap_manager.cc
|
|
||||||
content/browser/frame_host/navigation_controller_impl.cc
|
content/browser/frame_host/navigation_controller_impl.cc
|
||||||
content/browser/frame_host/render_frame_host_impl.cc
|
content/browser/frame_host/render_frame_host_impl.cc
|
||||||
content/browser/renderer_host/render_widget_host_view_mac.mm
|
content/browser/renderer_host/render_widget_host_view_mac.mm
|
||||||
|
@ -481,3 +480,13 @@ patches:
|
||||||
description: |
|
description: |
|
||||||
Expose URLRequestContextGetter::{Add,Remove}Observer.
|
Expose URLRequestContextGetter::{Add,Remove}Observer.
|
||||||
This patch should be removed once we switch to using the net service (cc @robo)
|
This patch should be removed once we switch to using the net service (cc @robo)
|
||||||
|
-
|
||||||
|
author: Aleksei Kuzmin <alkuzmin@microsoft.com>
|
||||||
|
file: backport_7167a9eac.patch
|
||||||
|
description: |
|
||||||
|
"viz: Remove the global ServerSharedBitmapManager."
|
||||||
|
https://chromium-review.googlesource.com/802574
|
||||||
|
Landed in 69.0.3447.0.
|
||||||
|
See https://github.com/electron/electron/issues/14327
|
||||||
|
(Android specific changes and changes in some test files
|
||||||
|
have been removed from the diff.)
|
||||||
|
|
1298
patches/common/chromium/backport_7167a9eac.patch
Normal file
1298
patches/common/chromium/backport_7167a9eac.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -79,21 +79,6 @@ index 8b28c57f854e..a0e7056af23f 100644
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
|
|
||||||
index 9d84f91109a3..5e252917bc0f 100644
|
|
||||||
--- a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
|
|
||||||
+++ b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
|
|
||||||
@@ -63,7 +63,9 @@ base::LazyInstance<ServerSharedBitmapManager>::DestructorAtExit
|
|
||||||
ServerSharedBitmapManager::ServerSharedBitmapManager() = default;
|
|
||||||
|
|
||||||
ServerSharedBitmapManager::~ServerSharedBitmapManager() {
|
|
||||||
- DCHECK(handle_map_.empty());
|
|
||||||
+ // FIXME(alexeykuzmin): Gets constantly triggered on Windows CI.
|
|
||||||
+ // Backporting https://chromium-review.googlesource.com/802574 should help.
|
|
||||||
+ // DCHECK(handle_map_.empty());
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerSharedBitmapManager* ServerSharedBitmapManager::current() {
|
|
||||||
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
|
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
|
||||||
index 74ff6b4286c2..02bf1c55d86f 100644
|
index 74ff6b4286c2..02bf1c55d86f 100644
|
||||||
--- a/content/browser/frame_host/navigation_controller_impl.cc
|
--- a/content/browser/frame_host/navigation_controller_impl.cc
|
||||||
|
|
Loading…
Reference in a new issue