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

Update to Chromium version 60.0.3112.78

This commit is contained in:
Marshall Greenblatt 2017-07-28 22:24:49 -04:00
parent d5392b33ef
commit 0dba8a1f29
13 changed files with 70 additions and 91 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 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/60.0.3112.40', 'chromium_checkout': 'refs/tags/60.0.3112.78',
} }

6
patch/patch.cfg
View File

@ -306,12 +306,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/2196 # https://bitbucket.org/chromiumembedded/cef/issues/2196
'name': 'printing_context_2196', 'name': 'printing_context_2196',
}, },
{
# Windows: Fix GPU process crash.
# https://bugs.chromium.org/p/chromium/issues/detail?id=735986
'name': 'libangle_735986',
'path': 'third_party/angle/',
},
{ {
# Windows: Disable allocator for cef_sandbox builds. # Windows: Disable allocator for cef_sandbox builds.
# https://bitbucket.org/chromiumembedded/cef/issues/2220 # https://bitbucket.org/chromiumembedded/cef/issues/2220

8
patch/patches/browser_plugin_guest_1565.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
index 1f985ec..47bf303 100644 index e05acc6..c5e82a9 100644
--- content/browser/browser_plugin/browser_plugin_guest.cc --- content/browser/browser_plugin/browser_plugin_guest.cc
+++ content/browser/browser_plugin/browser_plugin_guest.cc +++ content/browser/browser_plugin/browser_plugin_guest.cc
@@ -322,14 +322,20 @@ void BrowserPluginGuest::InitInternal( @@ -322,14 +322,20 @@ void BrowserPluginGuest::InitInternal(
@ -25,7 +25,7 @@ index 1f985ec..47bf303 100644
} }
RendererPreferences* renderer_prefs = RendererPreferences* renderer_prefs =
@@ -805,7 +811,8 @@ void BrowserPluginGuest::OnWillAttachComplete( @@ -818,7 +824,8 @@ void BrowserPluginGuest::OnWillAttachComplete(
static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) { if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {
web_contents_view->CreateViewForWidget( web_contents_view->CreateViewForWidget(
@ -36,10 +36,10 @@ index 1f985ec..47bf303 100644
} }
diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
index 90e4de3..5311193 100644 index 60dce63..1126c41 100644
--- content/browser/frame_host/interstitial_page_impl.cc --- content/browser/frame_host/interstitial_page_impl.cc
+++ content/browser/frame_host/interstitial_page_impl.cc +++ content/browser/frame_host/interstitial_page_impl.cc
@@ -605,7 +605,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() { @@ -610,7 +610,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
WebContentsView* wcv = WebContentsView* wcv =
static_cast<WebContentsImpl*>(web_contents())->GetView(); static_cast<WebContentsImpl*>(web_contents())->GetView();
RenderWidgetHostViewBase* view = RenderWidgetHostViewBase* view =

2
patch/patches/compositor_1368.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 409df10..e1df182 100644 index 409df107..e1df182 100644
--- content/browser/compositor/gpu_process_transport_factory.cc --- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc +++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -240,6 +240,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() { @@ -240,6 +240,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {

18
patch/patches/content_1129_2015.patch
View File

@ -95,10 +95,10 @@ index 578c05b..b2d2687 100644
} }
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index cee576c..e3a7dd5 100644 index 747f19a..642a86d 100644
--- content/browser/frame_host/render_frame_host_impl.cc --- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc
@@ -865,10 +865,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { @@ -881,10 +881,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
IPC_MESSAGE_HANDLER(FrameHostMsg_ShowPopup, OnShowPopup) IPC_MESSAGE_HANDLER(FrameHostMsg_ShowPopup, OnShowPopup)
IPC_MESSAGE_HANDLER(FrameHostMsg_HidePopup, OnHidePopup) IPC_MESSAGE_HANDLER(FrameHostMsg_HidePopup, OnHidePopup)
#endif #endif
@ -109,7 +109,7 @@ index cee576c..e3a7dd5 100644
IPC_MESSAGE_HANDLER(FrameHostMsg_RequestOverlayRoutingToken, IPC_MESSAGE_HANDLER(FrameHostMsg_RequestOverlayRoutingToken,
OnRequestOverlayRoutingToken) OnRequestOverlayRoutingToken)
IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow) IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow)
@@ -1329,6 +1327,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -1347,6 +1345,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (navigation_handle_) { if (navigation_handle_) {
navigation_handle_->set_net_error_code( navigation_handle_->set_net_error_code(
static_cast<net::Error>(params.error_code)); static_cast<net::Error>(params.error_code));
@ -117,7 +117,7 @@ index cee576c..e3a7dd5 100644
} }
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -2584,14 +2583,12 @@ void RenderFrameHostImpl::OnHidePopup() { @@ -2602,14 +2601,12 @@ void RenderFrameHostImpl::OnHidePopup() {
} }
#endif #endif
@ -429,7 +429,7 @@ index ebf4cd4..27a9df4 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {} virtual void FocusedNodeChanged(const blink::WebNode& node) {}
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 7e2ea09..799a0d2 100644 index 2fd389c..8aa049b6 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
@@ -2902,7 +2902,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -2902,7 +2902,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -451,7 +451,7 @@ index 7e2ea09..799a0d2 100644
} }
void RenderFrameImpl::WillCommitProvisionalLoad() { void RenderFrameImpl::WillCommitProvisionalLoad() {
@@ -5502,9 +5505,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5509,9 +5512,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() || (!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0])); url != pending_navigation_params_->request_params.redirects[0]));
@ -463,7 +463,7 @@ index 7e2ea09..799a0d2 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation( if (GetContentClient()->renderer()->HandleNavigation(
@@ -5517,7 +5519,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5524,7 +5526,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
} }
return blink::kWebNavigationPolicyIgnore; return blink::kWebNavigationPolicyIgnore;
} }
@ -472,10 +472,10 @@ index 7e2ea09..799a0d2 100644
Referrer referrer( Referrer referrer(
RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request)); RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index d7a0de4..8d1e96e 100644 index 574acb3..924d6cf 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -754,6 +754,8 @@ void RenderThreadImpl::Init( @@ -756,6 +756,8 @@ void RenderThreadImpl::Init(
StartServiceManagerConnection(); StartServiceManagerConnection();

15
patch/patches/libangle_735986.patch
View File

@ -1,15 +0,0 @@
diff --git src/libANGLE/renderer/d3d/d3d11/Clear11.cpp src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
index 2b960fe..4755132 100644
--- src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+++ src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -370,8 +370,8 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams,
{
const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachmentIndex];
- if (clearParams.clearColor[colorAttachmentIndex] && attachment.isAttached() &&
- drawBufferStates[colorAttachmentIndex] != GL_NONE)
+ if (!clearParams.clearColor[colorAttachmentIndex] || !attachment.isAttached() ||
+ drawBufferStates[colorAttachmentIndex] == GL_NONE)
{
continue;
}

4
patch/patches/prefs_content_1161.patch
View File

@ -35,10 +35,10 @@ index 41f7a69..d04e476 100644
bool inert_visual_viewport; bool inert_visual_viewport;
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 af998d3..56a4cf9 100644 index d9a7e20..a1e971c 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
@@ -1399,6 +1399,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( @@ -1400,6 +1400,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view, blink::WebView* web_view,
CompositorDependencies* compositor_deps) { CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view); ApplyWebPreferences(prefs, web_view);

40
patch/patches/print_header_footer_1478_1565.patch
View File

@ -198,7 +198,7 @@ index 32b0451..9ccb733 100644
PrintHostMsg_SetOptionsFromDocument_Params /* params */) PrintHostMsg_SetOptionsFromDocument_Params /* params */)
-#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git components/printing/renderer/print_web_view_helper.cc components/printing/renderer/print_web_view_helper.cc diff --git components/printing/renderer/print_web_view_helper.cc components/printing/renderer/print_web_view_helper.cc
index 3c3c4b1..b07223d 100644 index 829b2dc..df3fc29 100644
--- components/printing/renderer/print_web_view_helper.cc --- components/printing/renderer/print_web_view_helper.cc
+++ components/printing/renderer/print_web_view_helper.cc +++ components/printing/renderer/print_web_view_helper.cc
@@ -320,7 +320,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame, @@ -320,7 +320,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
@ -233,7 +233,7 @@ index 3c3c4b1..b07223d 100644
// Helper function to scale and round an integer value with a double valued // Helper function to scale and round an integer value with a double valued
// scaling. // scaling.
@@ -916,6 +912,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderFrame* render_frame, @@ -932,6 +928,7 @@ PrintWebViewHelper::PrintWebViewHelper(content::RenderFrame* render_frame,
print_for_preview_(false), print_for_preview_(false),
delegate_(std::move(delegate)), delegate_(std::move(delegate)),
print_node_in_progress_(false), print_node_in_progress_(false),
@ -241,7 +241,7 @@ index 3c3c4b1..b07223d 100644
is_loading_(false), is_loading_(false),
is_scripted_preview_delayed_(false), is_scripted_preview_delayed_(false),
ipc_nesting_level_(0), ipc_nesting_level_(0),
@@ -978,10 +975,8 @@ void PrintWebViewHelper::ScriptedPrint(bool user_initiated) { @@ -994,10 +991,8 @@ void PrintWebViewHelper::ScriptedPrint(bool user_initiated) {
return; return;
if (g_is_preview_enabled) { if (g_is_preview_enabled) {
@ -252,7 +252,7 @@ index 3c3c4b1..b07223d 100644
} else { } else {
#if BUILDFLAG(ENABLE_BASIC_PRINTING) #if BUILDFLAG(ENABLE_BASIC_PRINTING)
Print(web_frame, blink::WebNode(), true /* is_scripted? */); Print(web_frame, blink::WebNode(), true /* is_scripted? */);
@@ -1007,14 +1002,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) { @@ -1023,14 +1018,10 @@ bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages) IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog) IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) #endif // BUILDFLAG(ENABLE_BASIC_PRINTING)
@ -267,7 +267,7 @@ index 3c3c4b1..b07223d 100644
IPC_MESSAGE_HANDLER(PrintMsg_SetPrintingEnabled, OnSetPrintingEnabled) IPC_MESSAGE_HANDLER(PrintMsg_SetPrintingEnabled, OnSetPrintingEnabled)
IPC_MESSAGE_UNHANDLED(handled = false) IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP() IPC_END_MESSAGE_MAP()
@@ -1062,7 +1053,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() { @@ -1078,7 +1069,6 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
} }
#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) #endif // BUILDFLAG(ENABLE_BASIC_PRINTING)
@ -275,7 +275,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::OnPrintForPrintPreview( void PrintWebViewHelper::OnPrintForPrintPreview(
const base::DictionaryValue& job_settings) { const base::DictionaryValue& job_settings) {
CHECK_LE(ipc_nesting_level_, 1); CHECK_LE(ipc_nesting_level_, 1);
@@ -1122,7 +1112,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview( @@ -1138,7 +1128,6 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
DidFinishPrinting(FAIL_PRINT); DidFinishPrinting(FAIL_PRINT);
} }
} }
@ -283,7 +283,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout( void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout(
const PageSizeMargins& page_layout_in_points, const PageSizeMargins& page_layout_in_points,
@@ -1147,7 +1136,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo( @@ -1163,7 +1152,6 @@ void PrintWebViewHelper::UpdateFrameMarginsCssInfo(
ignore_css_margins_ = (margins_type != DEFAULT_MARGINS); ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
} }
@ -291,7 +291,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) { void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) {
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@@ -1342,7 +1330,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() { @@ -1358,7 +1346,7 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
return true; return true;
} }
@ -300,7 +300,7 @@ index 3c3c4b1..b07223d 100644
bool PrintWebViewHelper::RenderPreviewPage( bool PrintWebViewHelper::RenderPreviewPage(
int page_number, int page_number,
const PrintMsg_Print_Params& print_params) { const PrintMsg_Print_Params& print_params) {
@@ -1371,7 +1359,7 @@ bool PrintWebViewHelper::RenderPreviewPage( @@ -1387,7 +1375,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
} }
return PreviewPageRendered(page_number, draft_metafile.get()); return PreviewPageRendered(page_number, draft_metafile.get());
} }
@ -309,7 +309,7 @@ index 3c3c4b1..b07223d 100644
bool PrintWebViewHelper::FinalizePrintReadyDocument() { bool PrintWebViewHelper::FinalizePrintReadyDocument() {
DCHECK(!is_print_ready_metafile_sent_); DCHECK(!is_print_ready_metafile_sent_);
@@ -1401,7 +1389,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() { @@ -1417,7 +1405,6 @@ bool PrintWebViewHelper::FinalizePrintReadyDocument() {
Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params)); Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params));
return true; return true;
} }
@ -317,7 +317,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::OnPrintingDone(bool success) { void PrintWebViewHelper::OnPrintingDone(bool success) {
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
@@ -1416,7 +1403,6 @@ void PrintWebViewHelper::OnSetPrintingEnabled(bool enabled) { @@ -1432,7 +1419,6 @@ void PrintWebViewHelper::OnSetPrintingEnabled(bool enabled) {
is_printing_enabled_ = enabled; is_printing_enabled_ = enabled;
} }
@ -325,7 +325,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) { void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@@ -1427,7 +1413,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) { @@ -1443,7 +1429,9 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
// that instead. // that instead.
auto plugin = delegate_->GetPdfElement(frame); auto plugin = delegate_->GetPdfElement(frame);
if (!plugin.IsNull()) { if (!plugin.IsNull()) {
@ -335,7 +335,7 @@ index 3c3c4b1..b07223d 100644
return; return;
} }
print_preview_context_.InitWithFrame(frame); print_preview_context_.InitWithFrame(frame);
@@ -1435,7 +1423,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) { @@ -1451,7 +1439,6 @@ void PrintWebViewHelper::OnInitiatePrintPreview(bool has_selection) {
? PRINT_PREVIEW_USER_INITIATED_SELECTION ? PRINT_PREVIEW_USER_INITIATED_SELECTION
: PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME); : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
} }
@ -343,7 +343,7 @@ index 3c3c4b1..b07223d 100644
bool PrintWebViewHelper::IsPrintingEnabled() const { bool PrintWebViewHelper::IsPrintingEnabled() const {
return is_printing_enabled_; return is_printing_enabled_;
@@ -1457,11 +1444,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) { @@ -1473,11 +1460,9 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
print_node_in_progress_ = true; print_node_in_progress_ = true;
@ -356,7 +356,7 @@ index 3c3c4b1..b07223d 100644
} else { } else {
#if BUILDFLAG(ENABLE_BASIC_PRINTING) #if BUILDFLAG(ENABLE_BASIC_PRINTING)
// Make a copy of the node, in case RenderView::OnContextMenuClosed() resets // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
@@ -1550,7 +1535,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { @@ -1566,7 +1551,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
} }
break; break;
@ -364,7 +364,7 @@ index 3c3c4b1..b07223d 100644
case FAIL_PREVIEW: case FAIL_PREVIEW:
int cookie = int cookie =
print_pages_params_ ? print_pages_params_->params.document_cookie : 0; print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
@@ -1562,7 +1546,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) { @@ -1578,7 +1562,6 @@ void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
} }
print_preview_context_.Failed(notify_browser_of_print_failure_); print_preview_context_.Failed(notify_browser_of_print_failure_);
break; break;
@ -372,7 +372,7 @@ index 3c3c4b1..b07223d 100644
} }
prep_frame_view_.reset(); prep_frame_view_.reset();
print_pages_params_.reset(); print_pages_params_.reset();
@@ -1695,7 +1678,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, @@ -1711,7 +1694,6 @@ bool PrintWebViewHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
return true; return true;
} }
@ -380,7 +380,7 @@ index 3c3c4b1..b07223d 100644
bool PrintWebViewHelper::SetOptionsFromPdfDocument( bool PrintWebViewHelper::SetOptionsFromPdfDocument(
PrintHostMsg_SetOptionsFromDocument_Params* options) { PrintHostMsg_SetOptionsFromDocument_Params* options) {
blink::WebLocalFrame* source_frame = print_preview_context_.source_frame(); blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
@@ -1802,7 +1784,6 @@ bool PrintWebViewHelper::UpdatePrintSettings( @@ -1818,7 +1800,6 @@ bool PrintWebViewHelper::UpdatePrintSettings(
print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS); print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
return false; return false;
} }
@ -388,7 +388,7 @@ index 3c3c4b1..b07223d 100644
#if BUILDFLAG(ENABLE_BASIC_PRINTING) #if BUILDFLAG(ENABLE_BASIC_PRINTING)
void PrintWebViewHelper::GetPrintSettingsFromUser( void PrintWebViewHelper::GetPrintSettingsFromUser(
@@ -1960,7 +1941,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem( @@ -1976,7 +1957,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
return true; return true;
} }
@ -396,7 +396,7 @@ index 3c3c4b1..b07223d 100644
void PrintWebViewHelper::ShowScriptedPrintPreview() { void PrintWebViewHelper::ShowScriptedPrintPreview() {
if (is_scripted_preview_delayed_) { if (is_scripted_preview_delayed_) {
is_scripted_preview_delayed_ = false; is_scripted_preview_delayed_ = false;
@@ -2091,7 +2071,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number, @@ -2107,7 +2087,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params)); Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
return true; return true;
} }

2
patch/patches/printing_context_2196.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index d06b61a..f41f848 100644 index 07850f5..2127e49 100644
--- chrome/browser/printing/print_job_worker.cc --- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc +++ chrome/browser/printing/print_job_worker.cc
@@ -121,6 +121,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, @@ -121,6 +121,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,

2
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 e661492..b3c0296 100644 index 8667ae7..8418e52 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
@@ -325,13 +325,30 @@ int RunService(MainDelegate* delegate) { @@ -325,13 +325,30 @@ int RunService(MainDelegate* delegate) {

44
patch/patches/storage_partition_1973.patch
View File

@ -152,10 +152,10 @@ index 73f3cba..55d488b 100644
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE, BrowserThread::IO, FROM_HERE,
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 8d76dbf..8b3c223 100644 index 7db804c..4ce5bcf 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
@@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -483,7 +483,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
// own non-shared process. // own non-shared process.
if (partition != default_partition || is_for_guests_only) { if (partition != default_partition || is_for_guests_only) {
RenderProcessHostImpl* host = new RenderProcessHostImpl( RenderProcessHostImpl* host = new RenderProcessHostImpl(
@ -164,7 +164,7 @@ index 8d76dbf..8b3c223 100644
is_for_guests_only); is_for_guests_only);
host->SetIsNeverSuitableForReuse(); host->SetIsNeverSuitableForReuse();
return host; return host;
@@ -494,7 +494,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -495,7 +495,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
return host_; return host_;
host_ = new RenderProcessHostImpl( host_ = new RenderProcessHostImpl(
@ -173,7 +173,7 @@ index 8d76dbf..8b3c223 100644
false /* for guests only */); false /* for guests only */);
host_->SetIsNeverSuitableForReuse(); host_->SetIsNeverSuitableForReuse();
host_->AddObserver(this); host_->AddObserver(this);
@@ -907,7 +907,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) { @@ -915,7 +915,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
RenderProcessHostImpl::RenderProcessHostImpl( RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context, BrowserContext* browser_context,
@ -182,7 +182,7 @@ index 8d76dbf..8b3c223 100644
bool is_for_guests_only) bool is_for_guests_only)
: fast_shutdown_started_(false), : fast_shutdown_started_(false),
deleting_soon_(false), deleting_soon_(false),
@@ -939,7 +939,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( @@ -947,7 +947,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost( indexed_db_factory_(new IndexedDBDispatcherHost(
id_, id_,
storage_partition_impl_->GetURLRequestContext(), storage_partition_impl_->GetURLRequestContext(),
@ -192,7 +192,7 @@ index 8d76dbf..8b3c223 100644
ChromeBlobStorageContext::GetFor(browser_context_))), ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false), channel_connected_(false),
sent_render_process_ready_(false), sent_render_process_ready_(false),
@@ -970,7 +971,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( @@ -980,7 +981,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
} }
push_messaging_manager_.reset(new PushMessagingManager( push_messaging_manager_.reset(new PushMessagingManager(
@ -202,7 +202,7 @@ index 8d76dbf..8b3c223 100644
AddObserver(indexed_db_factory_.get()); AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
@@ -1176,7 +1178,7 @@ bool RenderProcessHostImpl::Init() { @@ -1186,7 +1188,7 @@ bool RenderProcessHostImpl::Init() {
} }
void RenderProcessHostImpl::EnableSendQueue() { void RenderProcessHostImpl::EnableSendQueue() {
@ -211,7 +211,7 @@ index 8d76dbf..8b3c223 100644
InitializeChannelProxy(); InitializeChannelProxy();
} }
@@ -1273,6 +1275,22 @@ void RenderProcessHostImpl::ResetChannelProxy() { @@ -1283,6 +1285,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() { void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -234,7 +234,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(new ResourceSchedulerFilter(GetID())); AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance(); MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1287,8 +1305,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1297,8 +1315,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter( new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(), GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals, widget_helper_.get(), media_internals,
@ -245,7 +245,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(render_message_filter.get()); AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter( render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1317,10 +1335,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1327,10 +1345,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context); ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter( resource_message_filter_ = new ResourceMessageFilter(
@ -258,7 +258,7 @@ index 8d76dbf..8b3c223 100644
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
AddFilter(resource_message_filter_.get()); AddFilter(resource_message_filter_.get());
@@ -1344,10 +1362,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1354,10 +1372,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter( AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
AddFilter(new AppCacheDispatcherHost( AddFilter(new AppCacheDispatcherHost(
@ -271,7 +271,7 @@ index 8d76dbf..8b3c223 100644
#if BUILDFLAG(ENABLE_WEBRTC) #if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost( peer_connection_tracker_host_ = new PeerConnectionTrackerHost(
@@ -1386,13 +1404,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1396,13 +1414,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter = scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
new CacheStorageDispatcherHost(); new CacheStorageDispatcherHost();
@ -287,7 +287,7 @@ index 8d76dbf..8b3c223 100644
AddFilter(service_worker_filter.get()); AddFilter(service_worker_filter.get());
AddFilter(new SharedWorkerMessageFilter( AddFilter(new SharedWorkerMessageFilter(
@@ -1400,12 +1417,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1410,12 +1427,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
WorkerStoragePartition( WorkerStoragePartition(
storage_partition_impl_->GetURLRequestContext(), storage_partition_impl_->GetURLRequestContext(),
storage_partition_impl_->GetMediaURLRequestContext(), storage_partition_impl_->GetMediaURLRequestContext(),
@ -303,7 +303,7 @@ index 8d76dbf..8b3c223 100644
base::Bind(&RenderWidgetHelper::GetNextRoutingID, base::Bind(&RenderWidgetHelper::GetNextRoutingID,
base::Unretained(widget_helper_.get())))); base::Unretained(widget_helper_.get()))));
@@ -1421,11 +1438,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1431,11 +1448,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
GetID(), storage_partition_impl_->GetQuotaManager(), GetID(), storage_partition_impl_->GetQuotaManager(),
GetContentClient()->browser()->CreateQuotaPermissionContext())); GetContentClient()->browser()->CreateQuotaPermissionContext()));
@ -316,7 +316,7 @@ index 8d76dbf..8b3c223 100644
resource_context, service_worker_context, browser_context); resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get()); AddFilter(notification_message_filter_.get());
@@ -1441,6 +1455,11 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1451,6 +1465,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
void RenderProcessHostImpl::RegisterMojoInterfaces() { void RenderProcessHostImpl::RegisterMojoInterfaces() {
auto registry = base::MakeUnique<service_manager::BinderRegistry>(); auto registry = base::MakeUnique<service_manager::BinderRegistry>();
@ -328,7 +328,7 @@ index 8d76dbf..8b3c223 100644
channel_->AddAssociatedInterfaceForIOThread( channel_->AddAssociatedInterfaceForIOThread(
base::Bind(&IndexedDBDispatcherHost::AddBinding, base::Bind(&IndexedDBDispatcherHost::AddBinding,
base::Unretained(indexed_db_factory_.get()))); base::Unretained(indexed_db_factory_.get())));
@@ -1488,8 +1507,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -1503,8 +1522,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
AddUIThreadInterface( AddUIThreadInterface(
registry.get(), registry.get(),
base::Bind(&PlatformNotificationContextImpl::CreateService, base::Bind(&PlatformNotificationContextImpl::CreateService,
@ -338,7 +338,7 @@ index 8d76dbf..8b3c223 100644
GetID())); GetID()));
AddUIThreadInterface( AddUIThreadInterface(
registry.get(), registry.get(),
@@ -1725,6 +1743,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() { @@ -1746,6 +1764,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!is_worker_ref_count_disabled_); DCHECK(!is_worker_ref_count_disabled_);
is_worker_ref_count_disabled_ = true; is_worker_ref_count_disabled_ = true;
@ -346,7 +346,7 @@ index 8d76dbf..8b3c223 100644
if (!GetWorkerRefCount()) if (!GetWorkerRefCount())
return; return;
service_worker_ref_count_ = 0; service_worker_ref_count_ = 0;
@@ -3063,8 +3082,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance( @@ -3088,8 +3107,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance(
g_render_process_host_factory_->CreateRenderProcessHost( g_render_process_host_factory_->CreateRenderProcessHost(
browser_context, site_instance); browser_context, site_instance);
} else { } else {
@ -358,10 +358,10 @@ index 8d76dbf..8b3c223 100644
browser_context, partition, is_for_guests_only); browser_context, partition, is_for_guests_only);
} }
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 8d5033e..45b8a7c 100644 index 861012f..5221a19 100644
--- content/browser/renderer_host/render_process_host_impl.h --- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h
@@ -80,7 +80,6 @@ class RenderWidgetHostImpl; @@ -81,7 +81,6 @@ class RenderWidgetHostImpl;
class ResourceMessageFilter; class ResourceMessageFilter;
class SiteInstanceImpl; class SiteInstanceImpl;
class StoragePartition; class StoragePartition;
@ -369,7 +369,7 @@ index 8d5033e..45b8a7c 100644
typedef base::Thread* (*RendererMainThreadFactoryFunction)( typedef base::Thread* (*RendererMainThreadFactoryFunction)(
const InProcessChildThreadParams& params); const InProcessChildThreadParams& params);
@@ -112,7 +111,7 @@ class CONTENT_EXPORT RenderProcessHostImpl @@ -113,7 +112,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
public NON_EXPORTED_BASE(mojom::AssociatedInterfaceProvider) { public NON_EXPORTED_BASE(mojom::AssociatedInterfaceProvider) {
public: public:
RenderProcessHostImpl(BrowserContext* browser_context, RenderProcessHostImpl(BrowserContext* browser_context,
@ -378,7 +378,7 @@ index 8d5033e..45b8a7c 100644
bool is_for_guests_only); bool is_for_guests_only);
~RenderProcessHostImpl() override; ~RenderProcessHostImpl() override;
@@ -581,10 +580,10 @@ class CONTENT_EXPORT RenderProcessHostImpl @@ -588,10 +587,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called. // called.
int instance_id_ = 1; int instance_id_ = 1;

8
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -194,7 +194,7 @@ index 12d0616..ec5742a 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 e7fd89c..d3b2621 100644 index a501112..04645cd 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
@@ -198,6 +198,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( @@ -198,6 +198,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@ -241,7 +241,7 @@ index e7fd89c..d3b2621 100644
return ToDIPRect(bounds_in_pixels_); return ToDIPRect(bounds_in_pixels_);
} }
@@ -1296,6 +1303,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels( @@ -1303,6 +1310,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels(
} }
gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const { gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const {
@ -250,7 +250,7 @@ index e7fd89c..d3b2621 100644
return bounds_in_pixels_.origin(); return bounds_in_pixels_.origin();
} }
@@ -1422,9 +1431,15 @@ void DesktopWindowTreeHostX11::InitX11Window( @@ -1429,9 +1438,15 @@ void DesktopWindowTreeHostX11::InitX11Window(
attribute_mask |= CWBorderPixel; attribute_mask |= CWBorderPixel;
swa.border_pixel = 0; swa.border_pixel = 0;
@ -267,7 +267,7 @@ index e7fd89c..d3b2621 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(), bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(), bounds_in_pixels_.height(),
0, // border width 0, // border width
@@ -2042,6 +2057,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( @@ -2049,6 +2064,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
} }
break; break;
} }

10
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 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 7f4a8b0..f6a2840 100644 index 1dd2465..5e77e8c 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
@@ -1692,6 +1692,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1692,6 +1692,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@ -23,7 +23,7 @@ index 7f4a8b0..f6a2840 100644
if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) { if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(), view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
@@ -2259,6 +2266,15 @@ void WebContentsImpl::CreateNewWindow( @@ -2255,6 +2262,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;
@ -39,7 +39,7 @@ index 7f4a8b0..f6a2840 100644
WebContentsImpl* new_contents = NULL; WebContentsImpl* new_contents = NULL;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -2288,7 +2304,7 @@ void WebContentsImpl::CreateNewWindow( @@ -2284,7 +2300,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(
@ -48,7 +48,7 @@ index 7f4a8b0..f6a2840 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.
@@ -5204,7 +5220,7 @@ NavigationEntry* @@ -5210,7 +5226,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view = RenderWidgetHostViewBase* rwh_view =
@ -73,7 +73,7 @@ index fa0afb5..d677b31 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 ebd18a0..549329f 100644 index 930880c..41ba462 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
@@ -67,9 +67,11 @@ class PageState; @@ -67,9 +67,11 @@ class PageState;