diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 5ae6d4084..a0fb8fc74 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': '5fdc0fab22ce7efd32532ee989b223fa12f8171e', + 'chromium_checkout': 'refs/tags/64.0.3282.24', } diff --git a/patch/patch.cfg b/patch/patch.cfg index 0e79df15e..dc10a8120 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -344,16 +344,4 @@ patches = [ # https://bitbucket.org/chromiumembedded/cef/issues/2314 'name': 'mac_widevine_2314', }, - { - # Windows: Fix rc.py ico processing and add support for menuitem separators. - # https://bugs.chromium.org/p/chromium/issues/detail?id=792576 - # https://bugs.chromium.org/p/chromium/issues/detail?id=792594 - # Using 'DEPS' because it must be applied before the `gclient sync` step. - 'name': 'DEPS', - }, - { - # Fix ReportingServiceProxy mojo binding failure messages. - # https://bugs.chromium.org/p/chromium/issues/detail?id=784518 - 'name': 'blink_mojo_806477', - }, ] diff --git a/patch/patches/DEPS.patch b/patch/patches/DEPS.patch deleted file mode 100644 index 51e02688e..000000000 --- a/patch/patches/DEPS.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git build/toolchain/win/rc/linux64/rc.sha1 build/toolchain/win/rc/linux64/rc.sha1 -index 76f7627..11440ae 100644 ---- build/toolchain/win/rc/linux64/rc.sha1 -+++ build/toolchain/win/rc/linux64/rc.sha1 -@@ -1 +1 @@ --a6d75f015275c8a65ff855e8b78437dd03a9bb7d -\ No newline at end of file -+e642170ce663c75a44822c3bffb1579068ab6f17 -\ No newline at end of file -diff --git build/toolchain/win/rc/mac/rc.sha1 build/toolchain/win/rc/mac/rc.sha1 -index 8a817c5..ff0c32e 100644 ---- build/toolchain/win/rc/mac/rc.sha1 -+++ build/toolchain/win/rc/mac/rc.sha1 -@@ -1 +1 @@ --3ccc7a61fc5368e8db33364093e42a92de874a26 -\ No newline at end of file -+58489426ecea29e276c94529201bc6a0cc1da027 -\ No newline at end of file -diff --git build/toolchain/win/rc/win/rc.exe.sha1 build/toolchain/win/rc/win/rc.exe.sha1 -index c74dce41..165e4688 100644 ---- build/toolchain/win/rc/win/rc.exe.sha1 -+++ build/toolchain/win/rc/win/rc.exe.sha1 -@@ -1 +1 @@ --9887dc07d042bf58d20b5557e3f91d18d0254022 -\ No newline at end of file -+9de6c3d751b4432a3a7b1cf96f432a21187764e9 -\ No newline at end of file \ No newline at end of file diff --git a/patch/patches/blink_mojo_806477.patch b/patch/patches/blink_mojo_806477.patch deleted file mode 100644 index 4b648c097..000000000 --- a/patch/patches/blink_mojo_806477.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git third_party/WebKit/Source/core/frame/Deprecation.cpp third_party/WebKit/Source/core/frame/Deprecation.cpp -index db80f4a67b11..f3191313f929 100644 ---- third_party/WebKit/Source/core/frame/Deprecation.cpp -+++ third_party/WebKit/Source/core/frame/Deprecation.cpp -@@ -16,8 +16,9 @@ - #include "core/page/Page.h" - #include "core/workers/WorkerOrWorkletGlobalScope.h" - #include "platform/runtime_enabled_features.h" -+#include "public/platform/Platform.h" - #include "public/platform/reporting.mojom-blink.h" --#include "services/service_manager/public/cpp/interface_provider.h" -+#include "services/service_manager/public/cpp/connector.h" - #include "third_party/WebKit/common/feature_policy/feature_policy_feature.h" - - using blink::WebFeature; -@@ -796,7 +797,9 @@ void Deprecation::GenerateReport(const LocalFrame* frame, WebFeature feature) { - - // Send the deprecation report to the Reporting API. - mojom::blink::ReportingServiceProxyPtr service; -- frame->Client()->GetInterfaceProvider()->GetInterface(&service); -+ Platform* platform = Platform::Current(); -+ platform->GetConnector()->BindInterface(platform->GetBrowserServiceName(), -+ &service); - service->QueueDeprecationReport(document->Url(), info.message, - body->sourceFile(), body->lineNumber(), - body->columnNumber()); -diff --git third_party/WebKit/Source/core/frame/Intervention.cpp third_party/WebKit/Source/core/frame/Intervention.cpp -index fb342ba765db..089eb6a3d662 100644 ---- third_party/WebKit/Source/core/frame/Intervention.cpp -+++ third_party/WebKit/Source/core/frame/Intervention.cpp -@@ -11,8 +11,9 @@ - #include "core/frame/Report.h" - #include "core/frame/ReportingContext.h" - #include "core/inspector/ConsoleMessage.h" -+#include "public/platform/Platform.h" - #include "public/platform/reporting.mojom-blink.h" --#include "services/service_manager/public/cpp/interface_provider.h" -+#include "services/service_manager/public/cpp/connector.h" - - namespace blink { - -@@ -44,7 +45,9 @@ void Intervention::GenerateReport(const LocalFrame* frame, - - // Send the intervention report to the Reporting API. - mojom::blink::ReportingServiceProxyPtr service; -- frame->Client()->GetInterfaceProvider()->GetInterface(&service); -+ Platform* platform = Platform::Current(); -+ platform->GetConnector()->BindInterface(platform->GetBrowserServiceName(), -+ &service); - service->QueueInterventionReport(document->Url(), message, body->sourceFile(), - body->lineNumber(), body->columnNumber()); - } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index d67ef0506..61764ea63 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 1126d7e63c30..64ecb8982428 100644 +index c85ea87e5cef..2620ae997463 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/crypto.gni") @@ -10,7 +10,7 @@ index 1126d7e63c30..64ecb8982428 100644 import("//chrome/common/features.gni") import("//components/feature_engagement/features.gni") import("//components/nacl/features.gni") -@@ -1551,6 +1552,7 @@ split_static_library("browser") { +@@ -1553,6 +1554,7 @@ split_static_library("browser") { "//base:i18n", "//base/allocator:features", "//cc", @@ -18,7 +18,7 @@ index 1126d7e63c30..64ecb8982428 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1797,6 +1799,10 @@ split_static_library("browser") { +@@ -1799,6 +1801,10 @@ split_static_library("browser") { "//ui/web_dialogs", ] diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index c550433fd..86e8ce492 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -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 0fe78f76aaa7..8fb527cc2636 100644 +index c5ab3d4e4d7a..69f54123f2cc 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc -@@ -375,7 +375,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) +@@ -377,7 +377,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, content::NotificationService::AllSources()); diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch index fe5d29ef4..06fda386f 100644 --- a/patch/patches/content_1129_2015.patch +++ b/patch/patches/content_1129_2015.patch @@ -345,7 +345,7 @@ index 3e3d132705a8..4a972b4475e6 100644 return false; } diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h -index 3d34633700dd..6cee67f439f7 100644 +index 3d34633700dd..a3ab85aa14cb 100644 --- content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h @@ -73,6 +73,9 @@ class CONTENT_EXPORT ContentRendererClient { diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 4635a7e2d..ffc1c1d79 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -1,8 +1,8 @@ diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 0663535e3f81..e0e20722c820 100644 +index 53b0f5b1863e..092210ea44ec 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc -@@ -1082,10 +1082,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( +@@ -1083,10 +1083,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( // TODO(alexmos): This check should've been enforced earlier in the // navigation, in chrome::Navigate(). Verify this, and then convert this to // a CHECK and remove the fallback. @@ -18,7 +18,7 @@ index 0663535e3f81..e0e20722c820 100644 return true; } -@@ -1224,7 +1225,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( +@@ -1225,7 +1226,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation( // Double-check that the new SiteInstance is associated with the right // BrowserContext. @@ -29,10 +29,10 @@ index 0663535e3f81..e0e20722c820 100644 // If |new_instance| is a new SiteInstance for a subframe with an isolated // origin, set its process reuse policy so that such subframes are diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index e56b320170df..26aa6fe50311 100644 +index 3841f3c1c010..f2a7eb747a2a 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -343,6 +343,13 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -350,6 +350,13 @@ class CONTENT_EXPORT ContentBrowserClient { const GURL& current_url, const GURL& new_url); diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 07d4149d4..c255dd4e9 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 02b2c4212767..5a89d17b06a4 100644 +index 02b2c4212767..b8a3ebb82fbe 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -344,6 +344,7 @@ split_static_library("ui") { diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 6ced73a10..06ebce794 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -194,7 +194,7 @@ index db66147f0e9c..2b9bdfa2ec53 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 88486500f8d8..b1743e330a3d 100644 +index b802ad497cf2..46e7f0678c64 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -147,6 +147,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index a675293fa..364299318 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -30,7 +30,7 @@ index 123258b23cb2..f00869df94e3 100644 } diff --git third_party/WebKit/Source/core/page/Page.cpp third_party/WebKit/Source/core/page/Page.cpp -index c6071e8ba68e..4304cc95ba2e 100644 +index 451729509c46..b74eea96dbef 100644 --- third_party/WebKit/Source/core/page/Page.cpp +++ third_party/WebKit/Source/core/page/Page.cpp @@ -129,7 +129,8 @@ Page::Page(PageClients& page_clients) diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 0e1530cfd..126e34c61 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 991b42c3e041..ecdc0aaad9a5 100644 +index 6baccb95114e..688753b2a55f 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -4928,7 +4928,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4930,7 +4930,7 @@ Keep your key file in a safe place. You will need it to create new versions of y