bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 85.0.4183.83

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-08-26 20:49:11 -04:00
parent 1119d2723c
commit 37773afcc4
16 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/85.0.4183.26', 'chromium_checkout': 'refs/tags/85.0.4183.83',
'depot_tools_checkout': '233589f2e7' 'depot_tools_checkout': '233589f2e7'
} }

2
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn diff --git base/BUILD.gn base/BUILD.gn
index fb85807363f1..bdef6c7f64c7 100644 index 31b9d9258353..ca1d82201b53 100644
--- base/BUILD.gn --- base/BUILD.gn
+++ base/BUILD.gn +++ base/BUILD.gn
@@ -34,6 +34,7 @@ import("//build/config/ui.gni") @@ -34,6 +34,7 @@ import("//build/config/ui.gni")

6
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 3a18c70b25a7..a61f10db6379 100644 index 995b99c5ba9d..ba71d4093417 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index 3a18c70b25a7..a61f10db6379 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
@@ -1834,6 +1835,7 @@ static_library("browser") { @@ -1840,6 +1841,7 @@ static_library("browser") {
"//base/util/values:values_util", "//base/util/values:values_util",
"//build:branding_buildflags", "//build:branding_buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index 3a18c70b25a7..a61f10db6379 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2166,6 +2168,10 @@ static_library("browser") { @@ -2172,6 +2174,10 @@ static_library("browser") {
] ]
} }

6
patch/patches/chrome_browser_net_export.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index ccee1e9634b9..76d46431a200 100644 index a429fd975116..7f6c4e7622fb 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/crypto.gni") @@ -9,6 +9,7 @@ import("//build/config/crypto.gni")
@@ -21,7 +21,7 @@ index ccee1e9634b9..76d46431a200 100644
# Since browser and browser_ui actually depend on each other, # Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser. # we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less # However, this means browser_ui and browser should more or less
@@ -358,6 +363,7 @@ static_library("ui") { @@ -357,6 +362,7 @@ static_library("ui") {
"//base/allocator:buildflags", "//base/allocator:buildflags",
"//build:branding_buildflags", "//build:branding_buildflags",
"//cc/paint", "//cc/paint",
@@ -29,7 +29,7 @@ index ccee1e9634b9..76d46431a200 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -1476,6 +1482,7 @@ static_library("ui") { @@ -1475,6 +1481,7 @@ static_library("ui") {
"//components/keep_alive_registry", "//components/keep_alive_registry",
"//components/network_session_configurator/common", "//components/network_session_configurator/common",
"//components/page_load_metrics/browser", "//components/page_load_metrics/browser",

2
patch/patches/chrome_browser_product_override.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index d27f4eb65fa9..9bf1bde37e63 100644 index c72f20b6cda0..83c725c64350 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -1021,10 +1021,6 @@ void LaunchURL(const GURL& url, @@ -1021,10 +1021,6 @@ void LaunchURL(const GURL& url,

2
patch/patches/chrome_plugins.patch
View File

@@ -198,7 +198,7 @@ index c1870b0f56ef..d32b8d54fb3f 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL()); GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() && if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 03d1e6a07843..2fd040ed87b5 100644 index 35542225d869..b30cd9d24b0d 100644
--- chrome/renderer/chrome_content_renderer_client.cc --- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc
@@ -842,6 +842,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -842,6 +842,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

6
patch/patches/chrome_runtime.patch
View File

@@ -78,7 +78,7 @@ index 945cee14368b..38c180a6e7e6 100644
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index 5117fe3b5ee3..e8f37fa7066f 100644 index 5448284d476e..3197f24b5004 100644
--- chrome/browser/chrome_browser_main.cc --- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
@@ -89,7 +89,7 @@ index 5117fe3b5ee3..e8f37fa7066f 100644
#include "chrome/browser/about_flags.h" #include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h" #include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/after_startup_task_utils.h"
@@ -889,8 +890,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { @@ -891,8 +892,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of // Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of
// its QuitClosure to the BrowserProcessImpl to call when it is time to exit. // its QuitClosure to the BrowserProcessImpl to call when it is time to exit.
@@ -101,7 +101,7 @@ index 5117fe3b5ee3..e8f37fa7066f 100644
// These members must be initialized before returning from this function. // These members must be initialized before returning from this function.
// Android doesn't use StartupBrowserCreator. // Android doesn't use StartupBrowserCreator.
@@ -1592,11 +1595,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { @@ -1597,11 +1600,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// This step is costly and is already measured in // This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start. // Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|. // See the comment above for an explanation of |process_command_line|.

2
patch/patches/prefs_content_1161.patch
View File

@@ -35,7 +35,7 @@ index bf98747b7b38..fa046af3e0ee 100644
bool record_whole_document; bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index c6a990f87306..1b9759f2b603 100644 index efab61352658..f65cdba5b96c 100644
--- content/renderer/render_view_impl.cc --- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc
@@ -963,6 +963,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, @@ -963,6 +963,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,

4
patch/patches/print_preview_123.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
index 19f5cb8025bb..a53efc315de8 100644 index 6c30afbd726b..4e66f64e9ad0 100644
--- chrome/browser/download/download_prefs.cc --- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
@@ -21,7 +21,7 @@ index 19f5cb8025bb..a53efc315de8 100644
using content::BrowserContext; using content::BrowserContext;
using content::BrowserThread; using content::BrowserThread;
using content::DownloadManager; using content::DownloadManager;
@@ -352,6 +357,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( @@ -355,6 +360,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
// static // static
DownloadPrefs* DownloadPrefs::FromBrowserContext( DownloadPrefs* DownloadPrefs::FromBrowserContext(
content::BrowserContext* context) { content::BrowserContext* context) {

2
patch/patches/renderer_host_1070713.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index f2c4cbf78618..2a2f4d475538 100644 index c5140471ec2a..638d8259e801 100644
--- content/browser/renderer_host/render_view_host_impl.cc --- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -509,6 +509,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { @@ -509,6 +509,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {

2
patch/patches/rwh_background_color_1984.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 3ff69bf8cd7d..fe5fbf5f79fb 100644 index 338fd87a55cb..b79423eb0e24 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -676,10 +676,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { @@ -676,10 +676,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {

20
patch/patches/views_1749_2102.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
index 4c08fbf43c16..e319f8b6782f 100644 index c746b37d6278..b6cebc24b73e 100644
--- ui/base/models/menu_model.h --- ui/base/models/menu_model.h
+++ ui/base/models/menu_model.h +++ ui/base/models/menu_model.h
@@ -12,8 +12,11 @@ @@ -12,8 +12,11 @@
@@ -14,7 +14,7 @@ index 4c08fbf43c16..e319f8b6782f 100644
} }
namespace ui { namespace ui {
@@ -129,6 +132,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel @@ -133,6 +136,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel
// |event_flags| is a bit mask of ui::EventFlags. // |event_flags| is a bit mask of ui::EventFlags.
virtual void ActivatedAt(int index, int event_flags); virtual void ActivatedAt(int index, int event_flags);
@@ -234,10 +234,10 @@ index 5a45ef3cbf00..597d5f1e8767 100644
std::unique_ptr<SelectionController> selection_controller_; std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 7d60e21f3a44..998f5e114253 100644 index 87f9291b67d1..860c0a2e147b 100644
--- ui/views/controls/menu/menu_controller.cc --- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc
@@ -2657,8 +2657,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -2662,8 +2662,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item; MenuItemView* item = pending_state_.item;
@@ -252,7 +252,7 @@ index 7d60e21f3a44..998f5e114253 100644
MenuItemView* to_select = nullptr; MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty()) if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2677,8 +2682,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { @@ -2682,8 +2687,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() { void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item; MenuItemView* item = state_.item;
DCHECK(item); DCHECK(item);
@@ -304,10 +304,10 @@ index 158724b4752c..c82192848584 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu); virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 6d06d6fc20ea..28722992c551 100644 index 262ea70539ab..f91f6c9b668c 100644
--- ui/views/controls/menu/menu_item_view.cc --- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc
@@ -1030,6 +1030,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -1055,6 +1055,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_); spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_); spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags); canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@@ -323,7 +323,7 @@ index 6d06d6fc20ea..28722992c551 100644
} else if (render_selection) { } else if (render_selection) {
gfx::Rect item_bounds = GetLocalBounds(); gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) { if (type_ == Type::kActionableSubMenu) {
@@ -1097,6 +1106,13 @@ void MenuItemView::PaintMinorIconAndText( @@ -1122,6 +1131,13 @@ void MenuItemView::PaintMinorIconAndText(
} }
SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const { SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {
@@ -338,10 +338,10 @@ index 6d06d6fc20ea..28722992c551 100644
GetMenuController() && GetMenuController()->use_touchable_layout() GetMenuController() && GetMenuController()->use_touchable_layout()
? style::CONTEXT_TOUCH_MENU ? style::CONTEXT_TOUCH_MENU
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
index 7d0d04e10a19..a2fbe6b62328 100644 index b0b1cf9a7a79..17b37e84e933 100644
--- ui/views/controls/menu/menu_model_adapter.cc --- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc +++ ui/views/controls/menu/menu_model_adapter.cc
@@ -236,6 +236,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { @@ -240,6 +240,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
return false; return false;
} }

12
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@@ -18,10 +18,10 @@ index 85b265f70047..691e04ddcf97 100644
return renderer_frame_number_; return renderer_frame_number_;
} }
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index d6363c75664b..45288fdafdee 100644 index 73078c6123c3..b30d9e058935 100644
--- content/browser/renderer_host/render_widget_host_view_base.h --- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -66,6 +66,7 @@ class CursorManager; @@ -67,6 +67,7 @@ class CursorManager;
class MouseWheelPhaseHandler; class MouseWheelPhaseHandler;
class RenderWidgetHostImpl; class RenderWidgetHostImpl;
class RenderWidgetHostViewBaseObserver; class RenderWidgetHostViewBaseObserver;
@@ -29,7 +29,7 @@ index d6363c75664b..45288fdafdee 100644
class SyntheticGestureTarget; class SyntheticGestureTarget;
class TextInputManager; class TextInputManager;
class TouchSelectionControllerClientManager; class TouchSelectionControllerClientManager;
@@ -83,6 +84,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -84,6 +85,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
float current_device_scale_factor() const { float current_device_scale_factor() const {
return current_device_scale_factor_; return current_device_scale_factor_;
} }
@@ -39,7 +39,7 @@ index d6363c75664b..45288fdafdee 100644
// Returns the focused RenderWidgetHost inside this |view|'s RWH. // Returns the focused RenderWidgetHost inside this |view|'s RWH.
RenderWidgetHostImpl* GetFocusedWidget() const; RenderWidgetHostImpl* GetFocusedWidget() const;
@@ -117,6 +121,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -118,6 +122,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void DisableAutoResize(const gfx::Size& new_size) override; void DisableAutoResize(const gfx::Size& new_size) override;
bool IsScrollOffsetAtTop() override; bool IsScrollOffsetAtTop() override;
float GetDeviceScaleFactor() final; float GetDeviceScaleFactor() final;
@@ -48,7 +48,7 @@ index d6363c75664b..45288fdafdee 100644
TouchSelectionControllerClientManager* TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override; GetTouchSelectionControllerClientManager() override;
void SetRecordContentToVisibleTimeRequest( void SetRecordContentToVisibleTimeRequest(
@@ -439,6 +445,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -442,6 +448,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// helps to position the full screen widget on the correct monitor. // helps to position the full screen widget on the correct monitor.
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0; virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
@@ -61,7 +61,7 @@ index d6363c75664b..45288fdafdee 100644
// Sets the cursor for this view to the one associated with the specified // Sets the cursor for this view to the one associated with the specified
// cursor_type. // cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0; virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -616,6 +628,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -619,6 +631,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// specific RenderWidgetHostView. // specific RenderWidgetHostView.
base::Optional<DisplayFeature> display_feature_; base::Optional<DisplayFeature> display_feature_;

14
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 1afd8ac2c2cf..34d1ec7938b2 100644 index 1db46cd9bee4..a0c84db7caf4 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -2225,15 +2225,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2229,15 +2229,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name; std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -33,7 +33,7 @@ index 1afd8ac2c2cf..34d1ec7938b2 100644
} }
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3035,6 +3042,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -3039,6 +3046,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects. // objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance; create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -49,7 +49,7 @@ index 1afd8ac2c2cf..34d1ec7938b2 100644
std::unique_ptr<WebContentsImpl> new_contents; std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -6405,6 +6421,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -6409,6 +6425,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents. // This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary(); SetAsFocusedWebContentsIfNecessary();
} }
@@ -72,7 +72,7 @@ index f1dcf53ea481..192f7c0ddd04 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default; WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 40b5d17d9c73..662068b57f36 100644 index c5d3d6a2004f..573dd337ad72 100644
--- content/public/browser/web_contents.h --- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h +++ content/public/browser/web_contents.h
@@ -82,8 +82,10 @@ class BrowserContext; @@ -82,8 +82,10 @@ class BrowserContext;
@@ -130,10 +130,10 @@ index e545ff70c612..41cd5299898f 100644
// typically happens when popups are created. // typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents, virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index 0cab1ba9e1ef..1f74ccca4ff2 100644 index 231047ad1fe1..ed2cfad7fdf7 100644
--- content/public/browser/web_contents_observer.h --- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h
@@ -599,6 +599,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { @@ -600,6 +600,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// WebContents has gained/lost focus. // WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

2
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,7 +44,7 @@ index bab98605009b..92709eee4924 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { 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 diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 0c862d2c081d..0ee94c96018b 100644 index 6032e38bfd64..7f2bd154e417 100644
--- third_party/blink/renderer/core/frame/local_frame.cc --- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1484,7 +1484,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1484,7 +1484,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 39f6ac6a3f52..a9540fd77690 100644 index 15e301fc0521..402d4c986057 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -5051,7 +5051,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -5051,7 +5051,7 @@ Keep your key file in a safe place. You will need it to create new versions of y