Skip to content

Commit

Permalink
update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
loc committed Aug 5, 2020
1 parent cc9cb9b commit 60224be
Show file tree
Hide file tree
Showing 29 changed files with 111 additions and 337 deletions.
4 changes: 0 additions & 4 deletions patches/chromium/.patches
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,4 @@ remove_some_deps_that_do_not_work_on_arm64.patch
chore_disable_failing_blink_font_dcheck_on_big_sur.patch
fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
skip_atk_toolchain_check.patch
fix_missing_weakptr_check_in_preconnectmanager.patch
revert_swiftshader_roll_in_deps.patch
worker_feat_add_hook_to_notify_script_ready.patch
mac_work_around_xcode_12b3_sdk_bug.patch
fix_provide_axtextchangevaluestartmarker_a11y_value_change.patch
10 changes: 5 additions & 5 deletions patches/chromium/add_didinstallconditionalfeatures.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ index e1bd458060e2eba703562121f134d0eede7c1986..7b9f534dbfff58c0778a2a4b0c79adb7
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index cc5f3bb765bdde2025746e013235a49be03233ce..8d9fcb1a95ac5259faa69d182259f2578c990434 100644
index 9de559c2a38c2d36ae37ea1d188067923b21dc79..e397aed25556a5214164512825ca5dfbfb9a0aa0 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4801,6 +4801,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4804,6 +4804,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

Expand All @@ -40,7 +40,7 @@ index cc5f3bb765bdde2025746e013235a49be03233ce..8d9fcb1a95ac5259faa69d182259f257
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 8bd0812eae248d0708a52b6b429d2d61a119e066..50ca5f63054f46d11cf1dcc9cd814cbd9911672a 100644
index ef81b1aabe30982884df8eb6e71ac0b403ebbff1..b0251c1f6ef8b87e4a07483b52c91e3cd46b4f61 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -738,6 +738,8 @@ class CONTENT_EXPORT RenderFrameImpl
Expand Down Expand Up @@ -79,10 +79,10 @@ index 4e2f84beb37dd435afcc9ee0ad8b519f0e2af78a..2341fe4301ccc95a73197c60bd9301f1
if (World().IsMainWorld()) {
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
index a94a48052511354a494381488035064d65377de6..ddd889a4c027d19ccd6aecc9f7a5b62e48a12e88 100644
index 887c0c0e5fada9a58b7dfa02b17bf01952506461..b3d9e5ac5059dbddc9b0f930a2f93222b23a48eb 100644
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
@@ -391,6 +391,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -392,6 +392,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
web_frame_->Client()->DidCreateScriptContext(context, world_id);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/blink-worker-enable-csp-in-file-scheme.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
This allows file:// URLs in workers to have a CSP.

diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
index 64d9dd23406bc8727f9e651186a29bbd963947bb..bca78841bd301eabd0e15df7455fa877f9e58a3c 100644
index 7acd62e8657cce14733fa9d2449f3c48ad0dc0a6..f4c6c8b6361a6ae8403b13137cc213803892db5e 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -378,7 +378,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
@@ -369,7 +369,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
// document (which is implemented in WorkerMessagingProxy, and
// m_contentSecurityPolicy should be left as nullptr to inherit the policy).
if (!response.CurrentRequestUrl().ProtocolIs("blob") &&
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/blink_local_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron.

diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index ab6646d4c22140ab719a852edbb96770f837e781..436d9a9ee6fc4280a45248ab98e244b75315f05e 100644
index f6e09d3e7bf9dadf67cf6dbd44b2cddcbf822c1d..63321bc40d8dc5977bc3a9932a5393e511ac78dc 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -554,10 +554,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -553,10 +553,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
}
CHECK(!view_ || !view_->IsAttached());

Expand All @@ -28,7 +28,7 @@ index ab6646d4c22140ab719a852edbb96770f837e781..436d9a9ee6fc4280a45248ab98e244b7
if (!Client())
return;

@@ -575,6 +571,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -574,6 +570,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
// Notify ScriptController that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy.
GetScriptController().ClearForClose();
Expand Down
8 changes: 4 additions & 4 deletions patches/chromium/blink_world_context.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
otherwise not available in the Blink API.

diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 699eb3760cc6e5e8393b746ee144e057d33328db..993a4af7a8d01535a73eff6a3172c224b0cb2401 100644
index a194c3644d45a74f05429bfe99df6f2b679f5a73..21a0c913e4c2f199e562234c5a1a0036ea626548 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -351,6 +351,8 @@ class WebLocalFrame : public WebFrame {
Expand All @@ -20,10 +20,10 @@ index 699eb3760cc6e5e8393b746ee144e057d33328db..993a4af7a8d01535a73eff6a3172c224
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index f8808c9931ad28b7c3a179a488c88c1f3be27924..f5229bf06d5351013f78c51c6ae1b9956b63acf6 100644
index b8f923e5ef0960abdb46dfdc2ab855c7abaa344e..2b7ad5ca532a79acae1d1b426b9d75cb2ef0ef31 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -944,6 +944,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -941,6 +941,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}

Expand All @@ -38,7 +38,7 @@ index f8808c9931ad28b7c3a179a488c88c1f3be27924..f5229bf06d5351013f78c51c6ae1b995
return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index 4c43fd1a2faf9654660b3e14a50e0791deb6958f..ead48b479875bb95a879790d8d824b75a4c074b7 100644
index 0e181074eddab9ee5decb7483e4a2e7ba7e7f9a6..d8c956b03ffb806e4e1fe2666494e3efe5886d7f 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -162,6 +162,8 @@ class CORE_EXPORT WebLocalFrameImpl final
Expand Down
22 changes: 11 additions & 11 deletions patches/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.

diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 10a484951ad952a4ec6097adf638f05e6c90274c..f3c83b6ac71ba32cbb7f227848c92560369dea94 100644
index 116b5c8f5386829d82ae79fd2db252d3a67ca66e..2c1262b92f620d4cc451a9d966101638f9877d71 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -4697,6 +4697,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -4727,6 +4727,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
Expand All @@ -21,10 +21,10 @@ index 10a484951ad952a4ec6097adf638f05e6c90274c..f3c83b6ac71ba32cbb7f227848c92560
&no_javascript_access);

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index eb1a2348fd4fcea05a9102ea330fa78b1bcd71e4..6a6e75caad01800a473a0d4a0e6b3d8f1cdc53d2 100644
index 1cf8510a842c966a18592cd5ab5b3d1086e7f88b..a8f98d4ae29260727ee39e9723f9bb6af4018348 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3353,9 +3353,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3368,9 +3368,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
}

if (delegate_) {
Expand All @@ -38,10 +38,10 @@ index eb1a2348fd4fcea05a9102ea330fa78b1bcd71e4..6a6e75caad01800a473a0d4a0e6b3d8f

for (auto& observer : observers_) {
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index b2102804849454a15bd4fc9b51393c6197956a07..3863d2edac67accdd093520f88915bfd9c77f48e 100644
index a3eb0274ba76a614117c2b2f60d10c6ada597f37..4477e9c0f8d7c56606bf5fe7e858a2bf8352e7b0 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -283,6 +283,10 @@ struct CreateNewWindowParams {
@@ -284,6 +284,10 @@ struct CreateNewWindowParams {

// The window features to use for the new window.
blink.mojom.WindowFeatures features;
Expand Down Expand Up @@ -135,7 +135,7 @@ index 61ed37a5868fd53f669d40c62542d6271daea91d..c1d7b01d0d63f9f1ba90a32511f69318
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 739b872650d5046832613ce70dbc1f5aa07a2c55..fb55234745342c0586462693c7f43a3004417d9d 100644
index b76e278330b364c60fb70018194d8b647fb01039..7a2caf820cbb97fa55b58c10ada37ea81f158038 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -67,6 +67,7 @@
Expand All @@ -158,10 +158,10 @@ index 739b872650d5046832613ce70dbc1f5aa07a2c55..fb55234745342c0586462693c7f43a30
// moved on send.
bool is_background_tab =
diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
index 42b90b2ee018b7a85d40a45e59b7fe29e6271f07..523ba9575ffebaaabb6fd120a89c314514598f17 100644
index c22aeb8e80440061f33271762b373912ef30cc48..5418efe944e0e897adb754f790ba8182c20f87ec 100644
--- a/content/shell/browser/web_test/web_test_content_browser_client.cc
+++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
@@ -379,6 +379,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -381,6 +381,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
Expand Down Expand Up @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6

} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 4a67362668b0a37552483a457b8f45a5bab6d791..72fed58f29a44172ddf7559a6968e1cc6aecf0ea 100644
index 83d7c4f7d405d3bba7eec65d96d559f5bfb0e327..20c1987f3c1ede7973b9036fd57fd092b254dd6d 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1982,6 +1982,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -1915,6 +1915,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
}

WebWindowFeatures window_features = GetWindowFeaturesFromString(features);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 739fdd94022a2b355655d46ecf6b72d1c3448cb3..ef4b30d0481d68d0311ab213e9b51c7be1a65900 100644
index c7ed1f0f0ae81409c6c723d865d8320615ab4f2a..1a68befc7a09ec797421ea96267e726d62e6ad7b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5548,6 +5548,7 @@ static_library("browser") {
@@ -5555,6 +5555,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/crash_allow_setting_more_options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ index 0e5d2b6e06d751afae39c161cd64a35ebbba3999..2af7fcb3b4115b6bc1f468e3c6c91b01
// Used by WebView to sample crashes without generating the unwanted dumps. If
// the returned value is less than 100, crash dumping will be sampled to that
diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed19b9cb4b 100644
index aa7c3302f2e3fc7129381b355ed4fa1bc386f8cb..d7dd05118f3c90f5ab570f59685c43bd180885e5 100644
--- a/components/crash/core/app/crashpad_mac.mm
+++ b/components/crash/core/app/crashpad_mac.mm
@@ -67,6 +67,8 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
@@ -71,6 +71,8 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
} // @autoreleasepool
return process_annotations;
}();
Expand All @@ -87,7 +87,7 @@ index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed
return annotations;
}

@@ -137,6 +139,13 @@ base::FilePath PlatformCrashpadInitialization(
@@ -141,6 +143,13 @@ base::FilePath PlatformCrashpadInitialization(

std::vector<std::string> arguments;

Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/dcheck.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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 2173b19c3c600fd295ef866578e66fda66145775..f70222975cbe215f8c1bd5b16936105ba74768c4 100644
index c7e29730692fa4bc1a61869b3ff43082fb23c479..164613a77c2ade72c8cb37edc1242f94f2a525bf 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1271,8 +1271,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/disable_color_correct_rendering.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107.

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 0f965f1ef71437248591026d123fc3d6d6808ea4..ace56eedf0b907332a50b65cd66bf780053519e9 100644
index 2c3ec66fb4b86ebb18d3e07054182d00d7d8d654..813602f6e878ecacecf7bbbad54dde2e3312c75a 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1856,6 +1856,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
Expand Down Expand Up @@ -231,7 +231,7 @@ index 122f0c0bf83ac9e0c0bdcebb498e08ac7809cc0d..4f8ebd5b05f359b5cac79589b16d98f0
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 33626c3674e780d9647dd56a8014f8eac476feca..0d97a216795ee86387b485f365ae4836b4281117 100644
index 499daa0d4c8acecaf7f7d0bf4e8505b66c7c05a3..ea8fad572580d68783af81be2a268c511e784893 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -225,6 +225,7 @@
Expand All @@ -242,7 +242,7 @@ index 33626c3674e780d9647dd56a8014f8eac476feca..0d97a216795ee86387b485f365ae4836
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3282,6 +3283,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3289,6 +3290,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/disable_hidden.patch
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ index 82362569ddb112a8ba9d7551242b2167ec47e073..8390fe9b57b871f8084907be843b4426
const base::TimeDelta& delay) {
new_content_rendering_delay_ = delay;
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 575c43716523f584a3a00e7f3e24b534c9455676..72889f957652ad9ba12c03732408430d55e88503 100644
index 879822b0372c7c79905ba78fa4c1077268fc2e93..a121519450387b606950137bb8441f4420b388d4 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -622,7 +622,7 @@ void RenderWidgetHostViewAura::HideImpl() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows.

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index bb3479c8a2d9093d6b01650c79d281295d78f41e..18bd69cd68b40f97f2e7e0ea6689ab8d5a18cdda 100644
index 0ba74f2826bf994b32b48d27f9fbb4bcdcac6a27..dd591bc54686634a13ac4c7b675feb6a3aa2067b 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -504,6 +504,10 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
Expand All @@ -21,7 +21,7 @@ index bb3479c8a2d9093d6b01650c79d281295d78f41e..18bd69cd68b40f97f2e7e0ea6689ab8d
return is_active();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 73ab668888efe828da795dd4640f7cf376017b07..433894584af1c90373bd11e2d5bfa3112d8064ab 100644
index a66502aebe95f17a7f8b562d0cf4296da77ecb38..a838821ebd19a86c32bcadd2a00000814de56e77 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -110,6 +110,7 @@ class CONTENT_EXPORT RenderViewHostImpl
Expand Down Expand Up @@ -61,7 +61,7 @@ index 50601f801e08a90d8556007617a0310bc3bfe2e3..f1f03eb2eb91567cbda2f8b9abe9979e
// This interface should only be implemented inside content.
friend class RenderViewHostImpl;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index fb55234745342c0586462693c7f43a3004417d9d..fbb8821704d8f32dca92031e88592b429c53437b 100644
index 7a2caf820cbb97fa55b58c10ada37ea81f158038..c74c3df8bf585f18a3767bc37ae3db84ae1ae293 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1155,6 +1155,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
Expand All @@ -73,7 +73,7 @@ index fb55234745342c0586462693c7f43a3004417d9d..fbb8821704d8f32dca92031e88592b42
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck)
IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences)
IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted)
@@ -1613,6 +1615,12 @@ bool RenderViewImpl::GetContentStateImmediately() {
@@ -1614,6 +1616,12 @@ bool RenderViewImpl::GetContentStateImmediately() {
return send_content_state_immediately_;
}

Expand Down Expand Up @@ -111,7 +111,7 @@ index 2be7d1c89628f19bc13125f57ae56acb502619b4..051da1d40825d6012d271e740bccd672
// Visibility -----------------------------------------------------------

diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index c0323583be7f725ae8212763d0224069e0d20aee..a8e0451a4a9ac9be691286427168a4f722f9bcd1 100644
index 9ae726b29543a2a6f041c53ebecea0c738e6420a..9511609f61ba3881be702cd8b3307e2efe2acb0e 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3412,6 +3412,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
Expand Down

0 comments on commit 60224be

Please sign in to comment.