65 lines
3.4 KiB
Diff
65 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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.
|
|
|
|
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
|
|
index 1d417ce9405fd65b17137c01468d99eba7fa0e76..1f893cbbc248ac34b4f28d58e5cf9a20ddf29b7a 100644
|
|
--- a/content/browser/frame_host/navigation_controller_impl.cc
|
|
+++ b/content/browser/frame_host/navigation_controller_impl.cc
|
|
@@ -1250,8 +1250,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
|
|
return NAVIGATION_TYPE_NEW_SUBFRAME;
|
|
}
|
|
|
|
- // 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);
|
|
|
|
if (rfh->GetParent()) {
|
|
// All manual subframes would be did_create_new_entry and handled above, so
|
|
@@ -1507,7 +1509,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
|
|
new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
|
|
}
|
|
|
|
- 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
|
|
index ac1e34f5ee216360a8899ec9c8c047eaa06470ac..5581b2fc813fcb48798f19fa67e14e4b71235f75 100644
|
|
--- a/ui/base/clipboard/clipboard_win.cc
|
|
+++ b/ui/base/clipboard/clipboard_win.cc
|
|
@@ -743,10 +743,10 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
|
|
}
|
|
|
|
void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
|
|
- DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
|
|
+ //DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
|
|
if (handle && !::SetClipboardData(format, handle)) {
|
|
- DCHECK_NE(GetLastError(),
|
|
- static_cast<unsigned long>(ERROR_CLIPBOARD_NOT_OPEN));
|
|
+ //DCHECK_NE(GetLastError(),
|
|
+ // static_cast<unsigned long>(ERROR_CLIPBOARD_NOT_OPEN));
|
|
FreeData(format, handle);
|
|
}
|
|
}
|