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 76.0.3809.62

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-07-16 21:00:26 -04:00
parent 99c27f57b1
commit 763dfe6116
17 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/76.0.3809.0' 'chromium_checkout': 'refs/tags/76.0.3809.62'
} }

2
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 04aff03b621d..7e887b89a6d8 100644 index 4f9844f6f854..24550416990d 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/jumbo.gni") @@ -9,6 +9,7 @@ import("//build/config/jumbo.gni")

6
patch/patches/chrome_browser_net_export.patch
View File

@@ -24,10 +24,10 @@ index 761d300aa06b..f86558dd6efc 100644
// network quality change events. // network quality change events.
virtual network::NetworkQualityTracker* network_quality_tracker() = 0; virtual network::NetworkQualityTracker* network_quality_tracker() = 0;
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index c2e0b9172eb2..57c22ff16f4b 100644 index 39900e408887..44be9dbabb58 100644
--- chrome/browser/browser_process_impl.cc --- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc
@@ -683,6 +683,10 @@ BrowserProcessImpl::system_network_context_manager() { @@ -674,6 +674,10 @@ BrowserProcessImpl::system_network_context_manager() {
return SystemNetworkContextManager::GetInstance(); return SystemNetworkContextManager::GetInstance();
} }
@@ -51,7 +51,7 @@ index 95a7bd8e8b58..af7685f86848 100644
override; override;
network::NetworkQualityTracker* network_quality_tracker() override; network::NetworkQualityTracker* network_quality_tracker() override;
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 6bd5bea7ddb0..076306275b5b 100644 index ff5b402eb7af..028f4bdce1d1 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/jumbo.gni") @@ -10,6 +10,7 @@ import("//build/config/jumbo.gni")

6
patch/patches/chrome_browser_product_override.patch
View File

@@ -1,8 +1,8 @@
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 b5c53b099bb2..56aa2e75b114 100644 index 9ec73c5bb8fc..6526a6c96a09 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
@@ -1079,10 +1079,6 @@ void LaunchURL( @@ -1089,10 +1089,6 @@ void LaunchURL(
} }
} }
@@ -13,7 +13,7 @@ index b5c53b099bb2..56aa2e75b114 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process. // |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the // For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1100,6 +1096,14 @@ void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { @@ -1110,6 +1106,14 @@ void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
} // namespace } // namespace

2
patch/patches/chrome_pref_watcher.patch
View File

@@ -13,4 +13,4 @@ index b5ccdc521a36..716117c141cc 100644
+ private: + private:
void UpdateRendererPreferences(); void UpdateRendererPreferences();
void OnWebPrefChanged(const std::string& pref_name); void OnWebPrefChanged(const std::string& pref_name);

20
patch/patches/content_2015.patch
View File

@@ -79,10 +79,10 @@ index 30b2a43959da..7dbe5aad8bd2 100644
GetContentClient()->browser()->GetUserAgent()); GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING); version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
index 3bdd59c38012..9df67bd208b9 100644 index cf137f07cb69..1e071844137d 100644
--- content/browser/frame_host/render_frame_message_filter.cc --- content/browser/frame_host/render_frame_message_filter.cc
+++ content/browser/frame_host/render_frame_message_filter.cc +++ content/browser/frame_host/render_frame_message_filter.cc
@@ -809,6 +809,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, @@ -810,6 +810,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
void RenderFrameMessageFilter::OnGetPluginInfo( void RenderFrameMessageFilter::OnGetPluginInfo(
int render_frame_id, int render_frame_id,
const GURL& url, const GURL& url,
@@ -90,7 +90,7 @@ index 3bdd59c38012..9df67bd208b9 100644
const url::Origin& main_frame_origin, const url::Origin& main_frame_origin,
const std::string& mime_type, const std::string& mime_type,
bool* found, bool* found,
@@ -820,8 +821,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( @@ -821,8 +822,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
bool allow_wildcard = true; bool allow_wildcard = true;
*found = plugin_service_->GetPluginInfo( *found = plugin_service_->GetPluginInfo(
render_process_id_, render_frame_id, resource_context_, url, render_process_id_, render_frame_id, resource_context_, url,
@@ -262,10 +262,10 @@ index 3009401dac6b..b4c5a9e2db50 100644
}; };
diff --git content/common/frame_messages.h content/common/frame_messages.h diff --git content/common/frame_messages.h content/common/frame_messages.h
index c81c9fb4251c..3f266302f4e0 100644 index e5bcd550ade9..78657a4f5a64 100644
--- content/common/frame_messages.h --- content/common/frame_messages.h
+++ content/common/frame_messages.h +++ content/common/frame_messages.h
@@ -1266,9 +1266,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -1267,9 +1267,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false. // type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the // |actual_mime_type| is the actual mime type supported by the
// found plugin. // found plugin.
@@ -358,10 +358,10 @@ index 31fcd7d89bf8..9421e8a5db77 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h
index 14f7e7a34e2b..573bd466effe 100644 index 015386282c62..65bd48757105 100644
--- content/public/renderer/render_frame_observer.h --- content/public/renderer/render_frame_observer.h
+++ content/public/renderer/render_frame_observer.h +++ content/public/renderer/render_frame_observer.h
@@ -201,6 +201,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, @@ -204,6 +204,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
virtual void DidReceiveTransferSizeUpdate(int resource_id, virtual void DidReceiveTransferSizeUpdate(int resource_id,
int received_data_length) {} int received_data_length) {}
@@ -372,10 +372,10 @@ index 14f7e7a34e2b..573bd466effe 100644
virtual void FocusedElementChanged(const blink::WebElement& element) {} virtual void FocusedElementChanged(const blink::WebElement& element) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 2ab1163b56da..329e435a479d 100644 index e18fd3c17ddc..de5111867cfc 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -4031,7 +4031,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -4043,7 +4043,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type; std::string mime_type;
bool found = false; bool found = false;
Send(new FrameHostMsg_GetPluginInfo( Send(new FrameHostMsg_GetPluginInfo(
@@ -385,7 +385,7 @@ index 2ab1163b56da..329e435a479d 100644
params.mime_type.Utf8(), &found, &info, &mime_type)); params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found) if (!found)
return nullptr; return nullptr;
@@ -4464,6 +4465,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { @@ -4476,6 +4477,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
void RenderFrameImpl::FrameFocused() { void RenderFrameImpl::FrameFocused() {
Send(new FrameHostMsg_FrameFocused(routing_id_)); Send(new FrameHostMsg_FrameFocused(routing_id_));

6
patch/patches/linux_gtk_2014.patch
View File

@@ -39,10 +39,10 @@ index 07f06ac694f5..831fd9f82dbe 100644
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index 1fb3cf77f01c..dbb03ffe3333 100644 index d637b306110b..7996770352d4 100644
--- chrome/test/BUILD.gn --- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn +++ chrome/test/BUILD.gn
@@ -4286,7 +4286,7 @@ test("unit_tests") { @@ -4288,7 +4288,7 @@ test("unit_tests") {
if (use_gio) { if (use_gio) {
configs += [ "//build/linux:gio_config" ] configs += [ "//build/linux:gio_config" ]
} }
@@ -51,7 +51,7 @@ index 1fb3cf77f01c..dbb03ffe3333 100644
deps += [ "//chrome/browser/ui/libgtkui" ] deps += [ "//chrome/browser/ui/libgtkui" ]
} }
@@ -5286,7 +5286,7 @@ if (!is_android) { @@ -5289,7 +5289,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too. # suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
] ]

6
patch/patches/service_manager_654986.patch
View File

@@ -1,5 +1,5 @@
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
index 0d1fa74a3f43..11c7b62ac2ad 100644 index 0d1fa74a3f43..c06c98acffb2 100644
--- services/service_manager/embedder/main.cc --- services/service_manager/embedder/main.cc
+++ services/service_manager/embedder/main.cc +++ services/service_manager/embedder/main.cc
@@ -240,22 +240,36 @@ int RunService(MainDelegate* delegate) { @@ -240,22 +240,36 @@ int RunService(MainDelegate* delegate) {
@@ -115,7 +115,7 @@ index 0d1fa74a3f43..11c7b62ac2ad 100644
if (process_type == ProcessType::kEmbedder) if (process_type == ProcessType::kEmbedder)
delegate->ShutDownEmbedderProcess(); delegate->ShutDownEmbedderProcess();
+} +}
+
+int Main(MainParams& params) { +int Main(MainParams& params) {
+#if defined(OS_MACOSX) +#if defined(OS_MACOSX)
+ // We need this pool for all the objects created before we get to the event + // We need this pool for all the objects created before we get to the event
@@ -125,7 +125,7 @@ index 0d1fa74a3f43..11c7b62ac2ad 100644
+ params.autorelease_pool = + params.autorelease_pool =
+ std::make_unique<base::mac::ScopedNSAutoreleasePool>(); + std::make_unique<base::mac::ScopedNSAutoreleasePool>();
+#endif +#endif
+
+ int exit_code = MainInitialize(params); + int exit_code = MainInitialize(params);
+ if (exit_code >= 0) + if (exit_code >= 0)
+ return exit_code; + return exit_code;

6
patch/patches/services_network_request_id_2718.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/network_service_client.cc content/browser/network_service_client.cc diff --git content/browser/network_service_client.cc content/browser/network_service_client.cc
index 2c2795aeaf51..7cded67a3fe3 100644 index 90ffdf4a0ab0..b9950eb3c54e 100644
--- content/browser/network_service_client.cc --- content/browser/network_service_client.cc
+++ content/browser/network_service_client.cc +++ content/browser/network_service_client.cc
@@ -205,10 +205,6 @@ class LoginHandlerDelegate { @@ -207,10 +207,6 @@ class LoginHandlerDelegate {
} }
WebContents* web_contents = web_contents_getter_.Run(); WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index 2c2795aeaf51..7cded67a3fe3 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled. // WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true; creating_login_delegate_ = true;
@@ -500,11 +496,6 @@ void NetworkServiceClient::OnAuthRequired( @@ -493,11 +489,6 @@ void NetworkServiceClient::OnAuthRequired(
base::RepeatingCallback<WebContents*(void)> web_contents_getter = base::RepeatingCallback<WebContents*(void)> web_contents_getter =
base::BindRepeating(GetWebContents, process_id, routing_id); base::BindRepeating(GetWebContents, process_id, routing_id);

4
patch/patches/storage_incognito_2289.patch
View File

@@ -43,10 +43,10 @@ index 0d95af0ef882..463709a9152f 100644
std::make_unique<media::InMemoryVideoDecodeStatsDBImpl>(nullptr); std::make_unique<media::InMemoryVideoDecodeStatsDBImpl>(nullptr);
} else { } else {
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 1aa874a2cf34..ff3279cbc323 100644 index 4ae43e97654a..b61fddeaa2c5 100644
--- content/browser/renderer_host/render_process_host_impl.cc --- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc
@@ -2178,6 +2178,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -2200,6 +2200,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
plugin_registry_.reset( plugin_registry_.reset(
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
} }

8
patch/patches/views_1749_2102.patch
View File

@@ -39,7 +39,7 @@ index cce16a111356..9f0a8b73adb5 100644
virtual void MenuWillShow() {} virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 87fd6313f5d8..42f58e7c13c9 100644 index bad91f31f867..eb282f9ebdec 100644
--- ui/gfx/render_text.cc --- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc +++ ui/gfx/render_text.cc
@@ -532,6 +532,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) { @@ -532,6 +532,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
@@ -57,7 +57,7 @@ index 87fd6313f5d8..42f58e7c13c9 100644
void RenderText::SetDisplayRect(const Rect& r) { void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) { if (r != display_rect_) {
display_rect_ = r; display_rect_ = r;
@@ -1638,6 +1646,19 @@ void RenderText::OnTextAttributeChanged() { @@ -1654,6 +1662,19 @@ void RenderText::OnTextAttributeChanged() {
if (!multiline_ && replace_newline_chars_with_symbols_) if (!multiline_ && replace_newline_chars_with_symbols_)
base::ReplaceChars(layout_text_, kNewline, kNewlineSymbol, &layout_text_); base::ReplaceChars(layout_text_, kNewline, kNewlineSymbol, &layout_text_);
@@ -78,7 +78,7 @@ index 87fd6313f5d8..42f58e7c13c9 100644
} }
diff --git ui/gfx/render_text.h ui/gfx/render_text.h diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index 5c3985176054..ceab2a4fd9ba 100644 index 5a422c0874bc..d53c1ac218c2 100644
--- ui/gfx/render_text.h --- ui/gfx/render_text.h
+++ ui/gfx/render_text.h +++ ui/gfx/render_text.h
@@ -310,6 +310,10 @@ class GFX_EXPORT RenderText { @@ -310,6 +310,10 @@ class GFX_EXPORT RenderText {
@@ -92,7 +92,7 @@ index 5c3985176054..ceab2a4fd9ba 100644
const Rect& display_rect() const { return display_rect_; } const Rect& display_rect() const { return display_rect_; }
void SetDisplayRect(const Rect& r); void SetDisplayRect(const Rect& r);
@@ -956,6 +960,8 @@ class GFX_EXPORT RenderText { @@ -966,6 +970,8 @@ class GFX_EXPORT RenderText {
// The cursor position in view space, used to traverse lines of varied widths. // The cursor position in view space, used to traverse lines of varied widths.
base::Optional<int> cached_cursor_x_; base::Optional<int> cached_cursor_x_;

12
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@@ -18,7 +18,7 @@ index a2902adc59b6..2289ef03efc0 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 903131f45d4f..49b0a67cb39e 100644 index 81bdc91eb351..d7de8c756168 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
@@ -75,6 +75,7 @@ class CursorManager; @@ -75,6 +75,7 @@ class CursorManager;
@@ -29,7 +29,7 @@ index 903131f45d4f..49b0a67cb39e 100644
class SyntheticGestureTarget; class SyntheticGestureTarget;
class TextInputManager; class TextInputManager;
class TouchSelectionControllerClientManager; class TouchSelectionControllerClientManager;
@@ -96,6 +97,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -95,6 +96,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 903131f45d4f..49b0a67cb39e 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;
@@ -130,6 +134,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -129,6 +133,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 903131f45d4f..49b0a67cb39e 100644
TouchSelectionControllerClientManager* TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override; GetTouchSelectionControllerClientManager() override;
void SetRecordTabSwitchTimeRequest(base::TimeTicks start_time, void SetRecordTabSwitchTimeRequest(base::TimeTicks start_time,
@@ -491,6 +497,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -490,6 +496,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 903131f45d4f..49b0a67cb39e 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;
@@ -664,6 +676,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -657,6 +669,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
bool is_currently_scrolling_viewport_ = false; bool is_currently_scrolling_viewport_ = false;
@@ -194,7 +194,7 @@ index 8ac960b083c8..66b6ff2a3259 100644
// a reference. // a reference.
corewm::TooltipWin* tooltip_; corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 81ef38287b65..f0e43abdc143 100644 index 2c502b3a5334..e4e9312aee63 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -211,6 +211,8 @@ std::vector<aura::Window*> DesktopWindowTreeHostX11::GetAllOpenWindows() { @@ -211,6 +211,8 @@ std::vector<aura::Window*> DesktopWindowTreeHostX11::GetAllOpenWindows() {

6
patch/patches/viz_osr_2575.patch
View File

@@ -93,7 +93,7 @@ index f17983a5cc70..4a8f2fd8d415 100644
"display/bsp_tree.h", "display/bsp_tree.h",
"display/bsp_walk_action.cc", "display/bsp_walk_action.cc",
diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
index 8fe397588eb4..1218985f7310 100644 index 1f8132354d25..264ab0f85ba7 100644
--- components/viz/service/display_embedder/output_surface_provider_impl.cc --- components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc +++ components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@@ -104,7 +104,7 @@ index 8fe397588eb4..1218985f7310 100644
#include "components/viz/common/display/renderer_settings.h" #include "components/viz/common/display/renderer_settings.h"
#include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/frame_sinks/begin_frame_source.h"
#include "components/viz/service/display_embedder/gl_output_surface.h" #include "components/viz/service/display_embedder/gl_output_surface.h"
@@ -243,6 +244,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( @@ -244,6 +245,20 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
if (headless_) if (headless_)
return std::make_unique<SoftwareOutputDevice>(); return std::make_unique<SoftwareOutputDevice>();
@@ -163,7 +163,7 @@ index 906be544c90f..a110f254d7ec 100644
#if ENABLE_SYNC_CALL_RESTRICTIONS #if ENABLE_SYNC_CALL_RESTRICTIONS
diff --git services/viz/privileged/interfaces/compositing/display_private.mojom services/viz/privileged/interfaces/compositing/display_private.mojom diff --git services/viz/privileged/interfaces/compositing/display_private.mojom services/viz/privileged/interfaces/compositing/display_private.mojom
index deb327b77054..d9926ec35165 100644 index cd8dd80230d1..3b90812293ab 100644
--- services/viz/privileged/interfaces/compositing/display_private.mojom --- services/viz/privileged/interfaces/compositing/display_private.mojom
+++ services/viz/privileged/interfaces/compositing/display_private.mojom +++ services/viz/privileged/interfaces/compositing/display_private.mojom
@@ -77,12 +77,14 @@ interface DisplayPrivate { @@ -77,12 +77,14 @@ interface DisplayPrivate {

10
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 f88cff5ab6d1..981a83fdded2 100644 index 5d4b92af30e3..59f667ef18d5 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
@@ -2070,21 +2070,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2071,21 +2071,30 @@ 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);
@@ -45,7 +45,7 @@ index f88cff5ab6d1..981a83fdded2 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -2783,6 +2792,15 @@ void WebContentsImpl::CreateNewWindow( @@ -2784,6 +2793,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation = create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE; main_frame_route_id != MSG_ROUTING_NONE;
@@ -61,7 +61,7 @@ index f88cff5ab6d1..981a83fdded2 100644
std::unique_ptr<WebContents> new_contents; std::unique_ptr<WebContents> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -2815,7 +2833,7 @@ void WebContentsImpl::CreateNewWindow( @@ -2816,7 +2834,7 @@ void WebContentsImpl::CreateNewWindow(
// TODO(brettw): It seems bogus that we have to call this function on the // TODO(brettw): It seems bogus that we have to call this function on the
// newly created object and give it one of its own member variables. // newly created object and give it one of its own member variables.
new_view->CreateViewForWidget( new_view->CreateViewForWidget(
@@ -70,7 +70,7 @@ index f88cff5ab6d1..981a83fdded2 100644
} }
// Save the created window associated with the route so we can show it // Save the created window associated with the route so we can show it
// later. // later.
@@ -6387,7 +6405,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { @@ -6415,7 +6433,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view = RenderWidgetHostViewBase* rwh_view =

8
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,7 +44,7 @@ index 3de30fbbe096..a7cab9da38f2 100644
.Top() .Top()
.GetSecurityContext() .GetSecurityContext()
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 4851cb4a227b..cc88dce2db46 100644 index 06f9c9f62dc9..8115d99ac6a5 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
@@ -1234,7 +1234,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1234,7 +1234,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -85,7 +85,7 @@ index e839efcfbd0b..1927d8dd2ed0 100644
void DevToolsSession::FlushProtocolNotifications() { void DevToolsSession::FlushProtocolNotifications() {
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index bcab9669d29b..9e90c96b29e7 100644 index 0f8ae2090eb6..c14c6f4c114f 100644
--- third_party/blink/renderer/core/page/page.cc --- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc
@@ -185,7 +185,8 @@ Page::Page(PageClients& page_clients) @@ -185,7 +185,8 @@ Page::Page(PageClients& page_clients)
@@ -98,7 +98,7 @@ index bcab9669d29b..9e90c96b29e7 100644
// TODO(pdr): Initialize |validation_message_client_| lazily. // TODO(pdr): Initialize |validation_message_client_| lazily.
validation_message_client_( validation_message_client_(
MakeGarbageCollected<ValidationMessageClientImpl>(*this)), MakeGarbageCollected<ValidationMessageClientImpl>(*this)),
@@ -346,21 +347,40 @@ void Page::InitialStyleChanged() { @@ -344,21 +345,40 @@ void Page::InitialStyleChanged() {
} }
} }
@@ -148,7 +148,7 @@ index bcab9669d29b..9e90c96b29e7 100644
page->NotifyPluginsChanged(); page->NotifyPluginsChanged();
} }
} }
@@ -832,7 +852,8 @@ void Page::Trace(blink::Visitor* visitor) { @@ -830,7 +850,8 @@ void Page::Trace(blink::Visitor* visitor) {
visitor->Trace(link_highlights_); visitor->Trace(link_highlights_);
visitor->Trace(spatial_navigation_controller_); visitor->Trace(spatial_navigation_controller_);
visitor->Trace(main_frame_); visitor->Trace(main_frame_);

4
patch/patches/webkit_popups.patch
View File

@@ -11,7 +11,7 @@ index 3b6b9a0bfc70..5ab43573416b 100644
// Cancels and hides the current popup (datetime, select...) if any. // Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0; virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index ec827ff90d5d..cd1f822785ae 100644 index 4a9056441d24..ade8e45bfcd0 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -234,8 +234,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -234,8 +234,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -39,7 +39,7 @@ index ec827ff90d5d..cd1f822785ae 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)) { fullscreen_controller_(std::make_unique<FullscreenController>(this)) {
if (!AsView().client) { if (!AsView().client) {
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 218915791efb..a57420b95773 100644 index 2e7c76cac3b3..ca1f60f68107 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h --- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,

4
patch/patches/webview_plugin_2020.patch
View File

@@ -1,8 +1,8 @@
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 af7b8fa63af0..118aea76fe39 100644 index 7386ba4464c6..949a33f45297 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4654,7 +4654,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4657,7 +4657,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">