diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index fe55a6ab8..43decbeaa 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/54.0.2840.6', + 'chromium_checkout': 'refs/tags/54.0.2840.16', } diff --git a/patch/patch.cfg b/patch/patch.cfg index a5c0e7221..a05e12911 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -256,10 +256,4 @@ patches = [ 'name': 'storage_partition_1973', 'path': '../', }, - { - # Fix debug assertion on right-click context menu. - # https://codereview.chromium.org/2288083002 - 'name': 'webkit_eventhandler_2288083002', - 'path': '../', - }, ] diff --git a/patch/patches/chrome_widevine.patch b/patch/patches/chrome_widevine.patch index a437e7c72..a1d2b4c5e 100644 --- a/patch/patches/chrome_widevine.patch +++ b/patch/patches/chrome_widevine.patch @@ -1,8 +1,8 @@ diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc -index 4325cec..7cb8a86 100644 +index 483c3c8..86cd70c 100644 --- chrome/common/chrome_content_client.cc +++ chrome/common/chrome_content_client.cc -@@ -76,7 +76,7 @@ +@@ -77,7 +77,7 @@ #endif #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 0dafb6945..74000f10d 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -39,10 +39,10 @@ index b7b042f..69a62f2 100644 // built in media player for the given |url|. Defaults to false. virtual bool ShouldUseMediaPlayerForURL(const GURL& url); diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc -index 95165ff..608409e 100644 +index 4a2c71f..fc61d73 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc -@@ -4917,7 +4917,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -4924,7 +4924,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( (pending_navigation_params_ && !pending_navigation_params_->request_params.redirects.empty()); @@ -50,7 +50,7 @@ index 95165ff..608409e 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (GetContentClient()->renderer()->HandleNavigation( -@@ -4926,7 +4925,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -4933,7 +4932,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( is_redirect)) { return blink::WebNavigationPolicyIgnore; } diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 69316493a..78ad8ad52 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -166,7 +166,7 @@ index a019144..af8839d 100644 PrintHostMsg_SetOptionsFromDocument_Params /* params */) -#endif // defined(ENABLE_PRINT_PREVIEW) diff --git components/printing/renderer/print_web_view_helper.cc components/printing/renderer/print_web_view_helper.cc -index 22207f3..5924464 100644 +index 7fa310f..8946ba9 100644 --- components/printing/renderer/print_web_view_helper.cc +++ components/printing/renderer/print_web_view_helper.cc @@ -86,6 +86,9 @@ const float kPrintingMinimumShrinkFactor = 1.333f; @@ -205,7 +205,7 @@ index 22207f3..5924464 100644 // Disable scaling when either: // - The PDF specifies disabling scaling. -@@ -371,7 +369,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame, +@@ -378,7 +376,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame, } #endif @@ -213,7 +213,7 @@ index 22207f3..5924464 100644 bool FitToPageEnabled(const base::DictionaryValue& job_settings) { bool fit_to_paper_size = false; if (!job_settings.GetBoolean(kSettingFitToPageEnabled, &fit_to_paper_size)) { -@@ -413,7 +410,6 @@ blink::WebPrintScalingOption GetPrintScalingOption( +@@ -421,7 +418,6 @@ blink::WebPrintScalingOption GetPrintScalingOption( } return blink::WebPrintScalingOptionFitToPrintableArea; } @@ -221,7 +221,7 @@ index 22207f3..5924464 100644 PrintMsg_Print_Params CalculatePrintParamsForCss( blink::WebLocalFrame* frame, -@@ -497,7 +493,6 @@ blink::WebView* FrameReference::view() { +@@ -505,7 +501,6 @@ blink::WebView* FrameReference::view() { return view_; } @@ -229,7 +229,7 @@ index 22207f3..5924464 100644 // static - Not anonymous so that platform implementations can use it. void PrintWebViewHelper::PrintHeaderAndFooter( blink::WebCanvas* canvas, -@@ -557,7 +552,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter( +@@ -565,7 +560,6 @@ void PrintWebViewHelper::PrintHeaderAndFooter( web_view->close(); frame->close(); } @@ -237,7 +237,7 @@ index 22207f3..5924464 100644 // static - Not anonymous so that platform implementations can use it. float PrintWebViewHelper::RenderPageContent(blink::WebFrame* frame, -@@ -843,6 +837,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view, +@@ -851,6 +845,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view, print_for_preview_(false), delegate_(std::move(delegate)), print_node_in_progress_(false), @@ -245,7 +245,7 @@ index 22207f3..5924464 100644 is_loading_(false), is_scripted_preview_delayed_(false), ipc_nesting_level_(0), -@@ -901,10 +896,8 @@ void PrintWebViewHelper::PrintPage(blink::WebLocalFrame* frame, +@@ -909,10 +904,8 @@ void PrintWebViewHelper::PrintPage(blink::WebLocalFrame* frame, return; if (g_is_preview_enabled) { @@ -256,7 +256,7 @@ index 22207f3..5924464 100644 } else { #if defined(ENABLE_BASIC_PRINTING) Print(frame, blink::WebNode(), true); -@@ -928,14 +921,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) { +@@ -936,14 +929,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages) IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog) #endif // defined(ENABLE_BASIC_PRINTING) @@ -271,7 +271,7 @@ index 22207f3..5924464 100644 IPC_MESSAGE_HANDLER(PrintMsg_SetScriptedPrintingBlocked, SetScriptedPrintBlocked) IPC_MESSAGE_UNHANDLED(handled = false) -@@ -990,7 +979,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() { +@@ -998,7 +987,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() { } #endif // defined(ENABLE_BASIC_PRINTING) @@ -279,7 +279,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::OnPrintForPrintPreview( const base::DictionaryValue& job_settings) { CHECK_LE(ipc_nesting_level_, 1); -@@ -1055,7 +1043,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview( +@@ -1063,7 +1051,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview( DidFinishPrinting(FAIL_PRINT); } } @@ -287,7 +287,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout( const PageSizeMargins& page_layout_in_points, -@@ -1080,7 +1067,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo( +@@ -1088,7 +1075,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo( ignore_css_margins_ = (margins_type != DEFAULT_MARGINS); } @@ -295,7 +295,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) { if (ipc_nesting_level_ > 1) return; -@@ -1241,7 +1227,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() { +@@ -1249,7 +1235,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() { return true; } @@ -304,7 +304,7 @@ index 22207f3..5924464 100644 bool PrintWebViewHelper::RenderPreviewPage( int page_number, const PrintMsg_Print_Params& print_params) { -@@ -1271,7 +1257,7 @@ bool PrintWebViewHelper::RenderPreviewPage( +@@ -1279,7 +1265,7 @@ bool PrintWebViewHelper::RenderPreviewPage( } return PreviewPageRendered(page_number, draft_metafile.get()); } @@ -313,7 +313,7 @@ index 22207f3..5924464 100644 bool PrintWebViewHelper::FinalizePrintReadyDocument() { DCHECK(!is_print_ready_metafile_sent_); -@@ -1301,7 +1287,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() { +@@ -1309,7 +1295,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() { Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params)); return true; } @@ -321,7 +321,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::OnPrintingDone(bool success) { if (ipc_nesting_level_ > 1) -@@ -1316,7 +1301,6 @@ void PrintWebViewHelper::SetScriptedPrintBlocked(bool blocked) { +@@ -1324,7 +1309,6 @@ void PrintWebViewHelper::SetScriptedPrintBlocked(bool blocked) { is_scripted_printing_blocked_ = blocked; } @@ -329,7 +329,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) { if (ipc_nesting_level_ > 1) return; -@@ -1327,7 +1311,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) { +@@ -1335,7 +1319,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) { // that instead. auto plugin = delegate_->GetPdfElement(frame); if (!plugin.isNull()) { @@ -339,7 +339,7 @@ index 22207f3..5924464 100644 return; } print_preview_context_.InitWithFrame(frame); -@@ -1335,7 +1321,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) { +@@ -1343,7 +1329,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool selection_only) { ? PRINT_PREVIEW_USER_INITIATED_SELECTION : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME); } @@ -347,7 +347,7 @@ index 22207f3..5924464 100644 bool PrintWebViewHelper::IsPrintingEnabled() { bool result = false; -@@ -1361,11 +1346,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) { +@@ -1369,11 +1354,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) { // Make a copy of the node, in case RenderView::OnContextMenuClosed resets // its |context_menu_node_|. @@ -360,7 +360,7 @@ index 22207f3..5924464 100644 } else { #if defined(ENABLE_BASIC_PRINTING) blink::WebNode duplicate_node(node); -@@ -1431,7 +1414,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { +@@ -1439,7 +1422,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { } break; @@ -368,7 +368,7 @@ index 22207f3..5924464 100644 case FAIL_PREVIEW: int cookie = print_pages_params_ ? print_pages_params_->params.document_cookie : 0; -@@ -1443,7 +1425,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { +@@ -1451,7 +1433,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { } print_preview_context_.Failed(notify_browser_of_print_failure_); break; @@ -376,7 +376,7 @@ index 22207f3..5924464 100644 } prep_frame_view_.reset(); print_pages_params_.reset(); -@@ -1575,7 +1556,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, +@@ -1583,7 +1564,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, return true; } @@ -384,7 +384,7 @@ index 22207f3..5924464 100644 bool PrintWebViewHelper::SetOptionsFromPdfDocument( PrintHostMsg_SetOptionsFromDocument_Params* options) { blink::WebLocalFrame* source_frame = print_preview_context_.source_frame(); -@@ -1684,7 +1664,6 @@ bool PrintWebViewHelper::UpdatePrintSettings( +@@ -1692,7 +1672,6 @@ bool PrintWebViewHelper::UpdatePrintSettings( return true; } @@ -392,7 +392,7 @@ index 22207f3..5924464 100644 #if defined(ENABLE_BASIC_PRINTING) bool PrintWebViewHelper::GetPrintSettingsFromUser(blink::WebLocalFrame* frame, -@@ -1793,7 +1772,6 @@ void PrintWebViewHelper::PrintPageInternal( +@@ -1801,7 +1780,6 @@ void PrintWebViewHelper::PrintPageInternal( MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile); @@ -400,7 +400,7 @@ index 22207f3..5924464 100644 if (params.params.display_header_footer) { // TODO(thestig): Figure out why Linux needs this. It is almost certainly // |printingMinimumShrinkFactor| from Blink. -@@ -1808,7 +1786,6 @@ void PrintWebViewHelper::PrintPageInternal( +@@ -1816,7 +1794,6 @@ void PrintWebViewHelper::PrintPageInternal( scale_factor / fudge_factor, page_layout_in_points, params.params); } @@ -408,7 +408,7 @@ index 22207f3..5924464 100644 float webkit_scale_factor = RenderPageContent(frame, params.page_number, canvas_area, content_area, -@@ -1844,7 +1821,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem( +@@ -1852,7 +1829,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem( return true; } @@ -416,7 +416,7 @@ index 22207f3..5924464 100644 void PrintWebViewHelper::ShowScriptedPrintPreview() { if (is_scripted_preview_delayed_) { is_scripted_preview_delayed_ = false; -@@ -1972,7 +1948,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number, +@@ -1980,7 +1956,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number, Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params)); return true; } diff --git a/patch/patches/render_widget_host_1070383005.patch b/patch/patches/render_widget_host_1070383005.patch index 55cd97c22..0a7f83964 100644 --- a/patch/patches/render_widget_host_1070383005.patch +++ b/patch/patches/render_widget_host_1070383005.patch @@ -1,5 +1,5 @@ diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm -index ecfcc9c..6bb0eda 100644 +index f918d13..4a242e8 100644 --- render_widget_host_view_mac.mm +++ render_widget_host_view_mac.mm @@ -467,9 +467,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, diff --git a/patch/patches/web_contents_1257.patch b/patch/patches/web_contents_1257.patch index 2cb3174cb..6a6efe23d 100644 --- a/patch/patches/web_contents_1257.patch +++ b/patch/patches/web_contents_1257.patch @@ -74,7 +74,7 @@ index 693e84d..be1f1dd 100644 int opener_render_frame_id, const std::string& frame_name, diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 51f3bba..dead593 100644 +index 05801d4..04c86da 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -1543,6 +1543,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patch/patches/webkit_eventhandler_2288083002.patch b/patch/patches/webkit_eventhandler_2288083002.patch deleted file mode 100644 index 020972a6f..000000000 --- a/patch/patches/webkit_eventhandler_2288083002.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git third_party/WebKit/Source/core/input/EventHandler.cpp third_party/WebKit/Source/core/input/EventHandler.cpp -index 9c49350..aa5e6a9 100644 ---- third_party/WebKit/Source/core/input/EventHandler.cpp -+++ third_party/WebKit/Source/core/input/EventHandler.cpp -@@ -2039,6 +2039,10 @@ WebInputEventResult EventHandler::sendContextMenuEvent(const PlatformMouseEvent& - LayoutPoint positionInContents = v->rootFrameToContents(event.position()); - HitTestRequest request(HitTestRequest::Active); - MouseEventWithHitTestResults mev = m_frame->document()->prepareMouseEvent(request, positionInContents, event); -+ // Since |Document::prepareMouseEvent()| modifies layout tree for setting -+ // hover element, we need to update layout tree for requirement of -+ // |SelectionController::sendContextMenuEvent()|. -+ m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets(); - - selectionController().sendContextMenuEvent(mev, positionInContents); -