bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 70.0.3538.35

This commit is contained in:
Marshall Greenblatt 2018-09-28 15:40:26 +02:00
parent b8ca094aca
commit df6fb4f06e
19 changed files with 71 additions and 66 deletions
Show Stats 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
{
'chromium_checkout': 'refs/tags/70.0.3538.7',
'chromium_checkout': 'refs/tags/70.0.3538.35',
}

1
libcef/browser/chrome_profile_stub.cc
View File

@ -53,7 +53,6 @@ bool ChromeProfileStub::IsChild() const {
}
bool ChromeProfileStub::IsLegacySupervised() const {
NOTREACHED();
return false;
}

5
libcef/browser/extensions/extensions_browser_client.cc
View File

@ -259,6 +259,11 @@ bool CefExtensionsBrowserClient::IsInDemoMode() {
return false;
}
bool CefExtensionsBrowserClient::IsScreensaverInDemoMode(
const std::string& app_id) {
return false;
}
bool CefExtensionsBrowserClient::IsRunningInForcedAppMode() {
return false;
}

1
libcef/browser/extensions/extensions_browser_client.h
View File

@ -85,6 +85,7 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
bool DidVersionUpdate(content::BrowserContext* context) override;
void PermitExternalProtocolHandler() override;
bool IsInDemoMode() override;
bool IsScreensaverInDemoMode(const std::string& app_id) override;
bool IsRunningInForcedAppMode() override;
bool IsAppModeForcedForApp(const ExtensionId& extension_id) override;
bool IsLoggedInAsPublicAccount() override;

8
patch/patches/browser_plugin_guest_1565.patch
View File

@ -37,7 +37,7 @@ index e5f885ab4bc0..4573329ad26a 100644
attached_ = true;
diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
index 26debf62bf01..973b88ff4752 100644
index 6a26f13d2466..af4a8f378d5e 100644
--- content/browser/frame_host/interstitial_page_impl.cc
+++ content/browser/frame_host/interstitial_page_impl.cc
@@ -634,7 +634,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
@ -79,10 +79,10 @@ index 41e44d5d658a..047c935d8ca2 100644
// Creates a new View that holds a popup and receives messages for it.
virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc
index f3b19570771b..fe1df8339576 100644
index e471459007af..2edd94c79b4d 100644
--- content/browser/web_contents/web_contents_view_aura.cc
+++ content/browser/web_contents/web_contents_view_aura.cc
@@ -796,7 +796,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size,
@@ -811,7 +811,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size,
}
RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
@ -92,7 +92,7 @@ index f3b19570771b..fe1df8339576 100644
if (render_widget_host->GetView()) {
// During testing, the view will already be set up in most cases to the
// test view, so we don't want to clobber it with a real one. To verify that
@@ -808,6 +809,7 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
@@ -823,6 +824,7 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
render_widget_host->GetView());
}

8
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 52ab34ca40a7..51eb9d1db641 100644
index 33a36da42b37..c92956f1c3a0 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index 52ab34ca40a7..51eb9d1db641 100644
import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni")
import("//components/feed/features.gni")
@@ -1691,6 +1692,7 @@ jumbo_split_static_library("browser") {
@@ -1689,6 +1690,7 @@ jumbo_split_static_library("browser") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc",
@ -18,7 +18,7 @@ index 52ab34ca40a7..51eb9d1db641 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1965,6 +1967,10 @@ jumbo_split_static_library("browser") {
@@ -1963,6 +1965,10 @@ jumbo_split_static_library("browser") {
]
}
@ -29,7 +29,7 @@ index 52ab34ca40a7..51eb9d1db641 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -3505,7 +3511,7 @@ jumbo_split_static_library("browser") {
@@ -3504,7 +3510,7 @@ jumbo_split_static_library("browser") {
]
}

4
patch/patches/chrome_browser_profiles.patch
View File

@ -71,10 +71,10 @@ index e8e76ce5b954..1dd338dd0142 100644
content::BrowserContext* GetBrowserContextRedirectedInIncognito(
content::BrowserContext* context);
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index acd7501aef4a..b53fe5e32289 100644
index 351207fb8b55..97962af699b3 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -382,7 +382,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -386,7 +386,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
content::NotificationService::AllSources());

36
patch/patches/content_2015.patch
View File

@ -64,10 +64,10 @@ index 569e6112d86b..41599944688a 100644
}
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
index d4d56c7c6a96..1ec4de7d5fd3 100644
index 77738cb5bec9..a8fbabe4b10f 100644
--- chrome/browser/ui/views/frame/browser_root_view.cc
+++ chrome/browser/ui/views/frame/browser_root_view.cc
@@ -66,7 +66,7 @@ void OnFindURLMimeType(const GURL& url,
@@ -69,7 +69,7 @@ void OnFindURLMimeType(const GURL& url,
content::PluginService::GetInstance()->GetPluginInfo(
-1, // process ID
MSG_ROUTING_NONE, // routing ID
@ -77,7 +77,7 @@ index d4d56c7c6a96..1ec4de7d5fd3 100644
}
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 72e60fdbe27c..8906cc6a598a 100644
index 6bc8930b7d82..76197c5dbe12 100644
--- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc
@@ -401,12 +401,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@ -94,10 +94,10 @@ index 72e60fdbe27c..8906cc6a598a 100644
"WillFailRequest state should come before WillProcessResponse");
return render_frame_host_;
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index 60b610202e7d..b14da4aba2f0 100644
index e67018e0f809..acfb47dd16bd 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -1671,6 +1671,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -1685,6 +1685,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (GetNavigationHandle()) {
GetNavigationHandle()->set_net_error_code(
static_cast<net::Error>(params.error_code));
@ -105,7 +105,7 @@ index 60b610202e7d..b14da4aba2f0 100644
}
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -4115,9 +4116,9 @@ void RenderFrameHostImpl::CommitNavigation(
@@ -4132,9 +4133,9 @@ void RenderFrameHostImpl::CommitNavigation(
// is used. Currently we have this here to make sure we have non-racy
// situation (https://crbug.com/849929).
DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
@ -117,7 +117,7 @@ index 60b610202e7d..b14da4aba2f0 100644
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::BindOnce(&PrefetchURLLoaderService::GetFactory,
@@ -4811,8 +4812,8 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
@@ -4828,8 +4829,8 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
this, false /* is_navigation */, false /* is_download */,
&default_factory_request);
@ -129,10 +129,10 @@ index 60b610202e7d..b14da4aba2f0 100644
storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
std::move(default_factory_request), std::move(params));
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
index 2f32390f0b45..6324f0f738e8 100644
index dfd9bb1aa8c9..1b8d91f88541 100644
--- content/browser/frame_host/render_frame_message_filter.cc
+++ content/browser/frame_host/render_frame_message_filter.cc
@@ -629,6 +629,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
@@ -635,6 +635,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
void RenderFrameMessageFilter::OnGetPluginInfo(
int render_frame_id,
const GURL& url,
@ -140,7 +140,7 @@ index 2f32390f0b45..6324f0f738e8 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
bool* found,
@@ -637,8 +638,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
@@ -643,8 +644,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
bool allow_wildcard = true;
*found = plugin_service_->GetPluginInfo(
render_process_id_, render_frame_id, resource_context_, url,
@ -152,10 +152,10 @@ index 2f32390f0b45..6324f0f738e8 100644
void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin(
diff --git content/browser/frame_host/render_frame_message_filter.h content/browser/frame_host/render_frame_message_filter.h
index 9716b2008062..362990246f97 100644
index a661ac526652..73c3a7077ddf 100644
--- content/browser/frame_host/render_frame_message_filter.h
+++ content/browser/frame_host/render_frame_message_filter.h
@@ -144,6 +144,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter
@@ -147,6 +147,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter
#if BUILDFLAG(ENABLE_PLUGINS)
void OnGetPluginInfo(int render_frame_id,
const GURL& url,
@ -364,7 +364,7 @@ index 88efca34d574..565f24148f7b 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 81bd5faff7f4..f3bbf5f124de 100644
index 04779161af26..6918dec5b847 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3577,7 +3577,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -377,7 +377,7 @@ index 81bd5faff7f4..f3bbf5f124de 100644
params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found)
return nullptr;
@@ -3948,6 +3949,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
@@ -3957,6 +3958,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
void RenderFrameImpl::FrameFocused() {
Send(new FrameHostMsg_FrameFocused(routing_id_));
@ -387,10 +387,10 @@ index 81bd5faff7f4..f3bbf5f124de 100644
void RenderFrameImpl::WillCommitProvisionalLoad() {
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index e0208d440f55..77ea92adb54d 100644
index b36daaee097a..3d2163ea2853 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -829,6 +829,8 @@ void RenderThreadImpl::Init() {
@@ -828,6 +828,8 @@ void RenderThreadImpl::Init() {
StartServiceManagerConnection();
@ -400,10 +400,10 @@ index e0208d440f55..77ea92adb54d 100644
base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest,
base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 8d7631fb756f..5239dde4a1c9 100644
index 4a594bd98bcd..79d3fdd29271 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -1192,6 +1192,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
@@ -1200,6 +1200,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
}

6
patch/patches/extensions_1947.patch
View File

@ -180,7 +180,7 @@ index ad1ef1bd0b8f..8014a61c5083 100644
// A weak pointer to the current or pending RenderViewHost. We don't access
// this through the host_contents because we want to deal with the pending
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 7e0c178e1e36..98066c8437a1 100644
index 5a2533dc788f..b21e25a9af25 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -61,6 +61,7 @@ class ComponentExtensionResourceManager;
@ -191,7 +191,7 @@ index 7e0c178e1e36..98066c8437a1 100644
class ExtensionHostDelegate;
class ExtensionPrefsObserver;
class ExtensionApiFrameIdMap;
@@ -132,6 +133,11 @@ class ExtensionsBrowserClient {
@@ -133,6 +134,11 @@ class ExtensionsBrowserClient {
virtual content::BrowserContext* GetOriginalContext(
content::BrowserContext* context) = 0;
@ -203,7 +203,7 @@ index 7e0c178e1e36..98066c8437a1 100644
#if defined(OS_CHROMEOS)
// Returns a user id hash from |context| or an empty string if no hash could
// be extracted.
@@ -214,6 +220,14 @@ class ExtensionsBrowserClient {
@@ -215,6 +221,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;

2
patch/patches/gn_config.patch
View File

@ -12,7 +12,7 @@ index 6fd17634ee87..0563b730a180 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index fd7e05257f9a..89d9e6c53d06 100644
index abc4f97ce994..addd29dff7fb 100644
--- BUILD.gn
+++ BUILD.gn
@@ -187,6 +187,7 @@ group("gn_all") {

8
patch/patches/linux_gtk_2014.patch
View File

@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index 0e7209082c6c..795c02bd676f 100644
index 4154546610db..e123d4d1a0e5 100644
--- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn
@@ -3827,7 +3827,7 @@ test("unit_tests") {
@@ -3830,7 +3830,7 @@ test("unit_tests") {
"../browser/ui/input_method/input_method_engine_unittest.cc",
]
}
@ -80,7 +80,7 @@ index 0e7209082c6c..795c02bd676f 100644
sources +=
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
deps += [ "//build/config/linux/gtk" ]
@@ -3848,7 +3848,7 @@ test("unit_tests") {
@@ -3851,7 +3851,7 @@ test("unit_tests") {
if (use_gio) {
configs += [ "//build/linux:gio_config" ]
}
@ -89,7 +89,7 @@ index 0e7209082c6c..795c02bd676f 100644
deps += [ "//chrome/browser/ui/libgtkui" ]
}
@@ -4970,7 +4970,7 @@ if (!is_android) {
@@ -4973,7 +4973,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc",
]

4
patch/patches/print_header_footer_1478_1565.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 58bfe0e13733..981abac36b2d 100644
index e25cab1de327..00bfb0f19aa3 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -828,6 +828,7 @@ jumbo_split_static_library("ui") {
@ -10,7 +10,7 @@ index 58bfe0e13733..981abac36b2d 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2709,7 +2710,7 @@ jumbo_split_static_library("ui") {
@@ -2712,7 +2713,7 @@ jumbo_split_static_library("ui") {
"views/frame/native_browser_frame_factory_ozone.cc",
]
} else {

4
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
index 126b857e541b..86dccf223b0a 100644
index b01698c81116..8196bc8f2e52 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -718,10 +718,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
@ -19,7 +19,7 @@ index 126b857e541b..86dccf223b0a 100644
}
void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -1932,6 +1934,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -1936,6 +1938,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_);

14
patch/patches/storage_partition_1973.patch
View File

@ -599,10 +599,10 @@ index 51f91bdd7e2f..a67745058ed3 100644
std::move(subresource_loader_factories), service_worker_context_,
appcache_handle_core,
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
index 6f6c5c1e504a..097095a613dd 100644
index 78110a30b23a..f387d99af595 100644
--- content/browser/storage_partition_impl.h
+++ content/browser/storage_partition_impl.h
@@ -95,7 +95,7 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -97,7 +97,7 @@ class CONTENT_EXPORT StoragePartitionImpl
storage::FileSystemContext* GetFileSystemContext() override;
storage::DatabaseTracker* GetDatabaseTracker() override;
DOMStorageContextWrapper* GetDOMStorageContext() override;
@ -611,7 +611,7 @@ index 6f6c5c1e504a..097095a613dd 100644
IndexedDBContextImpl* GetIndexedDBContext() override;
CacheStorageContextImpl* GetCacheStorageContext() override;
ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
@@ -136,14 +136,14 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -138,14 +138,14 @@ class CONTENT_EXPORT StoragePartitionImpl
void FlushNetworkInterfaceForTesting() override;
void WaitForDeletionTasksForTesting() override;
@ -634,9 +634,9 @@ index 6f6c5c1e504a..097095a613dd 100644
// blink::mojom::StoragePartitionService interface.
void OpenLocalStorage(const url::Origin& origin,
@@ -152,18 +152,19 @@ class CONTENT_EXPORT StoragePartitionImpl
const std::string& namespace_id,
blink::mojom::SessionStorageNamespaceRequest request) override;
@@ -159,18 +159,19 @@ class CONTENT_EXPORT StoragePartitionImpl
const std::vector<url::Origin>& origins,
OnCanSendReportingReportsCallback callback) override;
- scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter() {
- return url_loader_factory_getter_;
@ -658,7 +658,7 @@ index 6f6c5c1e504a..097095a613dd 100644
auto& bindings_for_testing() { return bindings_; }
@@ -174,10 +175,11 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -181,10 +182,11 @@ class CONTENT_EXPORT StoragePartitionImpl
// one must use the "chrome-guest://blahblah" site URL to ensure that the
// service worker stays in this StoragePartition. This is an empty GURL if
// this StoragePartition is not for guests.

20
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -194,7 +194,7 @@ index 364d6df184c5..0d32a4579c87 100644
// a reference.
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
index 590de782aca3..e87ee9935760 100644
index 065d98ec077e..e63ddacfd8a7 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@ -241,7 +241,7 @@ index 590de782aca3..e87ee9935760 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -1271,6 +1278,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
@@ -1272,6 +1279,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const {
@ -250,15 +250,15 @@ index 590de782aca3..e87ee9935760 100644
return bounds_in_pixels_.origin();
}
@@ -1415,7 +1424,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
::Atom window_type;
@@ -1416,7 +1425,6 @@ void DesktopWindowTreeHostX11::InitX11Window(
XAtom window_type;
switch (params.type) {
case Widget::InitParams::TYPE_MENU:
- swa.override_redirect = x11::True;
window_type = gfx::GetAtom("_NET_WM_WINDOW_TYPE_MENU");
break;
case Widget::InitParams::TYPE_TOOLTIP:
@@ -1471,9 +1479,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1472,9 +1480,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
attribute_mask |= CWBorderPixel;
swa.border_pixel = 0;
@ -275,7 +275,7 @@ index 590de782aca3..e87ee9935760 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -2089,6 +2103,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -2092,6 +2106,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@ -287,7 +287,7 @@ index 590de782aca3..e87ee9935760 100644
case x11::FocusOut:
OnFocusEvent(xev->type == x11::FocusIn, event->xfocus.mode,
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
index 5a0a3086545a..531619b16213 100644
index cc9d5fb48234..f8daf495d5d9 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h
@@ -91,6 +91,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@ -303,7 +303,7 @@ index 5a0a3086545a..531619b16213 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(const Widget::InitParams& params) override;
@@ -321,6 +327,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -330,6 +336,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@ -313,7 +313,7 @@ index 5a0a3086545a..531619b16213 100644
// Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -365,6 +374,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -370,6 +379,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Whether we used an ARGB visual for our window.
bool use_argb_visual_;
@ -324,7 +324,7 @@ index 5a0a3086545a..531619b16213 100644
DesktopDragDropClientAuraX11* drag_drop_client_;
std::unique_ptr<ui::EventHandler> x11_non_client_event_filter_;
@@ -454,6 +467,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -459,6 +472,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
uint32_t modal_dialog_counter_;

4
patch/patches/web_contents_1257_1565.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 36dab1bdee1d..27a1c1cbe0c8 100644
index 499c8c0a2e89..0dbf4cecdade 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1940,21 +1940,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@ -70,7 +70,7 @@ index 36dab1bdee1d..27a1c1cbe0c8 100644
}
// Save the created window associated with the route so we can show it
// later.
@@ -6042,7 +6060,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
@@ -6043,7 +6061,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view =

4
patch/patches/webkit_pointer_event_781966.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
index 2e4954ba8deb..f5f50ea77be8 100644
index b2af030b97d3..016d1ea8039d 100644
--- third_party/blink/renderer/core/input/pointer_event_manager.cc
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc
@@ -272,7 +272,7 @@ void PointerEventManager::HandlePointerInterruption(
@@ -281,7 +281,7 @@ void PointerEventManager::HandlePointerInterruption(
for (auto pointer_event : canceled_pointer_events) {
// If we are sending a pointercancel we have sent the pointerevent to some
// target before.

2
patch/patches/webkit_popups.patch
View File

@ -20,7 +20,7 @@ index 380ca3f69a26..fe841b6f25bd 100644
// Call these methods before and after running a nested, modal event loop
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 1a1e2cfb4fd2..9251b9a09504 100644
index 5f7f0416a6f2..40250fddf4ce 100644
--- 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) {

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
index b615103c64c1..d110be48ee0e 100644
index e655e8610fc1..700dcd03720a 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -4496,7 +4496,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -4505,7 +4505,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">