Update to Chromium version 85.0.4183.26

This commit is contained in:
Marshall Greenblatt
2020-07-17 19:31:28 -04:00
parent fab2af8876
commit b672bd9235
10 changed files with 24 additions and 23 deletions

View File

@@ -44,10 +44,10 @@ index bab98605009b..92709eee4924 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 81585d785de9..726ee5466d21 100644
index 0c862d2c081d..0ee94c96018b 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1483,7 +1483,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -1484,7 +1484,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;