[AUTO] Patches auto-rebase for master branch (#1943)
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
@@ -177,7 +177,7 @@ diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory
|
||||
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
|
||||
@@ -3063,7 +3063,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
|
||||
@@ -3069,7 +3069,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
|
||||
void ResourceFetcher::StopFetchingInternal(StopFetchingTarget target) {
|
||||
// TODO(toyoshim): May want to suspend scheduler while canceling loaders so
|
||||
// that the cancellations below do not awake unnecessary scheduling.
|
||||
|
||||
@@ -50325,7 +50325,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
|
||||
#include "content/browser/renderer_host/render_frame_host_impl.h"
|
||||
|
||||
@@ -3458,6 +3462,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
@@ -3459,6 +3463,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user