2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:44:38 -0700
|
|
|
|
Subject: dcheck.patch
|
|
|
|
|
|
|
|
This disables some debug checks which currently fail when running the Electron
|
|
|
|
test suite. In general there should be sustained effort to have all debug checks
|
|
|
|
enabled. If you want to help, choose one of the diffs below and remove it. Then
|
|
|
|
build Electron (debug configuration) and make sure all tests pass on the CI
|
|
|
|
systems. Unfortunately the tests don't always cover the check failures, so it's
|
|
|
|
good to also run some non-trivial Electron app to verify.
|
|
|
|
|
|
|
|
Apart from getting rid of a whole diff, you may also be able to replace one diff
|
|
|
|
with another which enables at least some of the previously disabled checks. For
|
|
|
|
example, the checks might be disabled for a whole build target, but actually
|
|
|
|
only one or two specific checks fail. Then it's better to simply comment out the
|
|
|
|
failing checks and allow the rest of the target to have them enabled.
|
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 81eb6e0c54655d36fad537c1573f5faaf6b5ead4..30ccdfa6294500846b9ddcb0dd4b3320afbcede3 100644
|
2020-09-21 08:00:36 +00:00
|
|
|
--- a/content/browser/renderer_host/navigation_controller_impl.cc
|
|
|
|
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1275,8 +1275,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
|
2018-09-14 05:02:16 +00:00
|
|
|
return NAVIGATION_TYPE_NEW_SUBFRAME;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
- // We only clear the session history when navigating to a new page.
|
|
|
|
- DCHECK(!params.history_list_was_cleared);
|
|
|
|
+ // Electron does its own book keeping of navigation entries and we
|
|
|
|
+ // expect content to not track any, by clearing history list for
|
|
|
|
+ // all navigations.
|
|
|
|
+ // DCHECK(!params.history_list_was_cleared);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
if (rfh->GetParent()) {
|
|
|
|
// All manual subframes would be did_create_new_entry and handled above, so
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1551,7 +1553,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
|
2018-09-14 05:02:16 +00:00
|
|
|
new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
- DCHECK(!params.history_list_was_cleared || !replace_entry);
|
|
|
|
+ // Electron does its own book keeping of navigation entries and we
|
|
|
|
+ // expect content to not track any, by clearing history list for
|
|
|
|
+ // all navigations.
|
|
|
|
+ // DCHECK(!params.history_list_was_cleared || !replace_entry);
|
|
|
|
// The browser requested to clear the session history when it initiated the
|
|
|
|
// navigation. Now we know that the renderer has updated its state accordingly
|
|
|
|
// and it is safe to also clear the browser side history.
|
|
|
|
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index d9e0b1e5820dc1d847cd1e74338476bf22f5cb12..ca75b9b34fe191c430e524bb9828a051cdeab157 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/ui/base/clipboard/clipboard_win.cc
|
|
|
|
+++ b/ui/base/clipboard/clipboard_win.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -850,10 +850,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const {
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2020-03-03 21:35:05 +00:00
|
|
|
void ClipboardWin::WriteToClipboard(ClipboardFormatType format, HANDLE handle) {
|
|
|
|
UINT cf_format = format.ToFormatEtc().cfFormat;
|
2020-01-17 18:41:52 +00:00
|
|
|
- DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
|
2020-03-03 21:35:05 +00:00
|
|
|
+ // DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
|
|
|
|
if (handle && !::SetClipboardData(cf_format, handle)) {
|
2020-01-17 18:41:52 +00:00
|
|
|
- DCHECK_NE(GetLastError(),
|
|
|
|
- static_cast<unsigned long>(ERROR_CLIPBOARD_NOT_OPEN));
|
2020-03-03 21:35:05 +00:00
|
|
|
+ // DCHECK_NE(GetLastError(),
|
|
|
|
+ // static_cast<unsigned long>(ERROR_CLIPBOARD_NOT_OPEN));
|
|
|
|
FreeData(cf_format, handle);
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
}
|