chore: deprecate apply-patches in favour of git-{import,export}-patches (#15300)
This commit is contained in:
parent
4185efa08f
commit
335e9f68b7
123 changed files with 4368 additions and 4780 deletions
|
@ -1,4 +1,4 @@
|
|||
From 0a8757b6650df0e762cc4ec400ecb7ee8ca7be4a Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
|
@ -39,25 +39,25 @@ These files have debug checks explicitly commented out:
|
|||
ui/base/clipboard/clipboard_win.cc
|
||||
|
||||
diff --git a/base/logging.h b/base/logging.h
|
||||
index 08c1f0fc5967..7a758ce3ef90 100644
|
||||
index 08c1f0fc59672b2134c634e081f0c4df4d261b75..7a758ce3ef90145d2b68e07e17f00fc30cfb30a6 100644
|
||||
--- a/base/logging.h
|
||||
+++ b/base/logging.h
|
||||
@@ -874,7 +874,7 @@ const LogSeverity LOG_DCHECK = LOG_FATAL;
|
||||
|
||||
|
||||
#else // !(defined(_PREFAST_) && defined(OS_WIN))
|
||||
|
||||
|
||||
-#if DCHECK_IS_ON()
|
||||
+#if DCHECK_IS_ON() && !defined(ELECTRON_NO_DCHECK)
|
||||
|
||||
|
||||
#define DCHECK(condition) \
|
||||
LAZY_STREAM(LOG_STREAM(DCHECK), !ANALYZER_ASSUME_TRUE(condition)) \
|
||||
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
|
||||
index c993fcb8a13a..80a5b708d259 100644
|
||||
index c993fcb8a13a156c1ba6fc1979d8d18fbedd9059..80a5b708d2597bbda53826dac4175fe9788bf154 100644
|
||||
--- a/base/memory/weak_ptr.cc
|
||||
+++ b/base/memory/weak_ptr.cc
|
||||
@@ -25,8 +25,8 @@ void WeakReference::Flag::Invalidate() {
|
||||
}
|
||||
|
||||
|
||||
bool WeakReference::Flag::IsValid() const {
|
||||
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_)
|
||||
- << "WeakPtrs must be checked on the same sequenced thread.";
|
||||
|
@ -65,22 +65,22 @@ index c993fcb8a13a..80a5b708d259 100644
|
|||
+ // << "WeakPtrs must be checked on the same sequenced thread.";
|
||||
return !invalidated_.IsSet();
|
||||
}
|
||||
|
||||
|
||||
diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
|
||||
index 7a664429bcd3..26f49dc3d1e7 100644
|
||||
index 7a664429bcd305b10da8c7317700f9124742f3b8..26f49dc3d1e782e69e74f2d177535b80a54b2433 100644
|
||||
--- a/base/process/kill_win.cc
|
||||
+++ b/base/process/kill_win.cc
|
||||
@@ -23,7 +23,7 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
|
||||
DWORD tmp_exit_code = 0;
|
||||
|
||||
|
||||
if (!::GetExitCodeProcess(handle, &tmp_exit_code)) {
|
||||
- DPLOG(FATAL) << "GetExitCodeProcess() failed";
|
||||
+ // DPLOG(FATAL) << "GetExitCodeProcess() failed";
|
||||
|
||||
|
||||
// This really is a random number. We haven't received any
|
||||
// information about the exit code, presumably because this
|
||||
diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
|
||||
index 18ef58a725c3..239f319c8b4c 100644
|
||||
index 18ef58a725c3a87a30413a4676044533f1751c7c..239f319c8b4cf52c115acd6173a15978f6ff3386 100644
|
||||
--- a/base/process/process_metrics_win.cc
|
||||
+++ b/base/process/process_metrics_win.cc
|
||||
@@ -153,10 +153,9 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
|
||||
|
@ -98,7 +98,7 @@ index 18ef58a725c3..239f319c8b4c 100644
|
|||
}
|
||||
}
|
||||
diff --git a/components/viz/service/display/program_binding.h b/components/viz/service/display/program_binding.h
|
||||
index 2a8fb9f54847..2c318b310b2a 100644
|
||||
index 2a8fb9f5484768f88ec6d383639da2d42fd777fd..2c318b310b2aeb39a1256feb612e19dc0fd53a72 100644
|
||||
--- a/components/viz/service/display/program_binding.h
|
||||
+++ b/components/viz/service/display/program_binding.h
|
||||
@@ -434,7 +434,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
|
||||
|
@ -109,37 +109,37 @@ index 2a8fb9f54847..2c318b310b2a 100644
|
|||
+ // DCHECK(IsContextLost(context_provider->ContextGL()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -446,7 +446,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
|
||||
|
||||
|
||||
// Link after binding uniforms
|
||||
if (!Link(context_provider->ContextGL())) {
|
||||
- DCHECK(IsContextLost(context_provider->ContextGL()));
|
||||
+ // DCHECK(IsContextLost(context_provider->ContextGL()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
|
||||
index d8aca9e2cbff..86224ab7a3c5 100644
|
||||
index d8aca9e2cbffdfd0bbb0bd67e8adfb53547132bb..86224ab7a3c5637422559da25bc8c1040a03e937 100644
|
||||
--- a/content/browser/frame_host/navigation_controller_impl.cc
|
||||
+++ b/content/browser/frame_host/navigation_controller_impl.cc
|
||||
@@ -995,8 +995,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
|
||||
@@ -1233,7 +1235,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
|
||||
|
@ -149,12 +149,12 @@ index d8aca9e2cbff..86224ab7a3c5 100644
|
|||
// 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/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
||||
index 8e5af3e3b9c5..520dcffb5353 100644
|
||||
index 8e5af3e3b9c5b9e5c7a2462600fb2c9582df0c7c..520dcffb53534e76d739cff74ea58d49bdfb682a 100644
|
||||
--- a/content/browser/frame_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/frame_host/render_frame_host_impl.cc
|
||||
@@ -2416,8 +2416,10 @@ void RenderFrameHostImpl::AllowBindings(int bindings_flags) {
|
||||
}
|
||||
|
||||
|
||||
enabled_bindings_ |= bindings_flags;
|
||||
- if (GetParent())
|
||||
- DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
|
||||
|
@ -162,28 +162,28 @@ index 8e5af3e3b9c5..520dcffb5353 100644
|
|||
+ // Fix this when we use OOPIF in Electron.
|
||||
+ // if (GetParent())
|
||||
+ // DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
|
||||
|
||||
|
||||
if (render_frame_created_) {
|
||||
if (!frame_bindings_control_)
|
||||
diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc
|
||||
index 3f80e73535c8..bf40b94ad24c 100644
|
||||
index 3f80e73535c8b4a2bcff08821e3585306f691c8b..bf40b94ad24c0621cbe093002c3355693219ebc4 100644
|
||||
--- a/ppapi/host/ppapi_host.cc
|
||||
+++ b/ppapi/host/ppapi_host.cc
|
||||
@@ -238,7 +238,7 @@ void PpapiHost::OnHostMsgResourceCreated(
|
||||
CreateResourceHost(params.pp_resource(), instance, nested_msg);
|
||||
|
||||
|
||||
if (!resource_host.get()) {
|
||||
- NOTREACHED();
|
||||
+ // NOTREACHED();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/third_party/blink/renderer/core/dom/node.cc b/third_party/blink/renderer/core/dom/node.cc
|
||||
index 5629f8170851..bc773ac9b1e4 100644
|
||||
index 5629f8170851f0b58069e2cd0c14ebe093d89d00..bc773ac9b1e462385dcbb8bef2fc4c2d7e6c7b06 100644
|
||||
--- a/third_party/blink/renderer/core/dom/node.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/node.cc
|
||||
@@ -2568,7 +2568,7 @@ StaticNodeList* Node::getDestinationInsertionPoints() {
|
||||
|
||||
|
||||
HTMLSlotElement* Node::AssignedSlot() const {
|
||||
// assignedSlot doesn't need to call updateDistribution().
|
||||
- DCHECK(!IsPseudoElement());
|
||||
|
@ -192,7 +192,7 @@ index 5629f8170851..bc773ac9b1e4 100644
|
|||
return root->AssignedSlotFor(*this);
|
||||
return nullptr;
|
||||
diff --git a/third_party/blink/renderer/core/loader/BUILD.gn b/third_party/blink/renderer/core/loader/BUILD.gn
|
||||
index 49b4ead3dc52..0083e5c8efb7 100644
|
||||
index 49b4ead3dc521796bf3c6a207a072ff5eeff1849..0083e5c8efb71cf2cb097944174dcad8eff1cc3e 100644
|
||||
--- a/third_party/blink/renderer/core/loader/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/core/loader/BUILD.gn
|
||||
@@ -135,4 +135,11 @@ blink_core_sources("loader") {
|
||||
|
@ -208,12 +208,12 @@ index 49b4ead3dc52..0083e5c8efb7 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h
|
||||
index 0e7c40b732ec..7c513d95a586 100644
|
||||
index 0e7c40b732ec283e006b2e3517c42e699d7e3102..7c513d95a586d8ac80e691aa89abaf49793e9a18 100644
|
||||
--- a/third_party/blink/renderer/platform/wtf/text/string_impl.h
|
||||
+++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h
|
||||
@@ -258,21 +258,21 @@ class WTF_EXPORT StringImpl {
|
||||
}
|
||||
|
||||
|
||||
ALWAYS_INLINE bool HasOneRef() const {
|
||||
-#if DCHECK_IS_ON()
|
||||
+#if 0
|
||||
|
@ -221,7 +221,7 @@ index 0e7c40b732ec..7c513d95a586 100644
|
|||
#endif
|
||||
return ref_count_ == 1;
|
||||
}
|
||||
|
||||
|
||||
ALWAYS_INLINE void AddRef() const {
|
||||
-#if DCHECK_IS_ON()
|
||||
+#if 0
|
||||
|
@ -229,7 +229,7 @@ index 0e7c40b732ec..7c513d95a586 100644
|
|||
#endif
|
||||
++ref_count_;
|
||||
}
|
||||
|
||||
|
||||
ALWAYS_INLINE void Release() const {
|
||||
-#if DCHECK_IS_ON()
|
||||
+#if 0
|
||||
|
@ -237,12 +237,12 @@ index 0e7c40b732ec..7c513d95a586 100644
|
|||
<< AsciiForDebugging() << " " << CurrentThread();
|
||||
#endif
|
||||
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
|
||||
index e49dd8c81270..9e61c901cd2d 100644
|
||||
index e49dd8c81270cdd9794ddee11bad036c2f444af5..9e61c901cd2df168520b83a8522ca8c032f4c0ae 100644
|
||||
--- a/ui/base/clipboard/clipboard_win.cc
|
||||
+++ b/ui/base/clipboard/clipboard_win.cc
|
||||
@@ -905,9 +905,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
|
||||
}
|
||||
|
||||
|
||||
void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
|
||||
- DCHECK(clipboard_owner_->hwnd() != NULL);
|
||||
+ // DCHECK(clipboard_owner_->hwnd() != NULL);
|
||||
|
@ -253,7 +253,7 @@ index e49dd8c81270..9e61c901cd2d 100644
|
|||
}
|
||||
}
|
||||
diff --git a/url/BUILD.gn b/url/BUILD.gn
|
||||
index 57bbe16c15ea..07725187c595 100644
|
||||
index 57bbe16c15ea442963a53f89b009e2c99c7b090a..07725187c595784d9e5f49d45a8835da78144830 100644
|
||||
--- a/url/BUILD.gn
|
||||
+++ b/url/BUILD.gn
|
||||
@@ -98,6 +98,10 @@ component("url") {
|
||||
|
@ -265,7 +265,8 @@ index 57bbe16c15ea..07725187c595 100644
|
|||
+ defines += [ "ELECTRON_NO_DCHECK" ]
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
if (is_android) {
|
||||
--
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue