1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: deepak1556 <[email protected]>
- 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 d6c77f00ee6fb5f0a21d2d3df2bc00aea3f7e5dc..f8aade234eab49e3600e5d78d9ce71af66646ba3 100644
- --- a/content/browser/frame_host/navigation_controller_impl.cc
- +++ b/content/browser/frame_host/navigation_controller_impl.cc
- @@ -1267,8 +1267,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
- @@ -1524,7 +1526,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 421f22eaaf6dbb90c8e3a4bb78d9d017bac8db94..959666ba60c97e0c2f082867c8ebd77de45d8788 100644
- --- a/ui/base/clipboard/clipboard_win.cc
- +++ b/ui/base/clipboard/clipboard_win.cc
- @@ -782,10 +782,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const {
-
- void ClipboardWin::WriteToClipboard(ClipboardFormatType format, HANDLE handle) {
- UINT cf_format = format.ToFormatEtc().cfFormat;
- - DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
- + // DCHECK_NE(clipboard_owner_->hwnd(), nullptr);
- if (handle && !::SetClipboardData(cf_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(cf_format, handle);
- }
- }
|