mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 57.0.2987.74
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/57.0.2987.21',
|
'chromium_checkout': 'refs/tags/57.0.2987.74',
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/
|
|||||||
index bd36336..9123781 100644
|
index bd36336..9123781 100644
|
||||||
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
||||||
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
||||||
@@ -201,6 +201,12 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {}
|
@@ -201,6 +201,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
|
||||||
g_spare_recyclable_compositors.Get().clear();
|
g_spare_recyclable_compositors.Get().clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ index bd36336..9123781 100644
|
|||||||
ui::AcceleratedWidgetMac* BrowserCompositorMac::GetAcceleratedWidgetMac() {
|
ui::AcceleratedWidgetMac* BrowserCompositorMac::GetAcceleratedWidgetMac() {
|
||||||
if (recyclable_compositor_)
|
if (recyclable_compositor_)
|
||||||
return recyclable_compositor_->accelerated_widget_mac();
|
return recyclable_compositor_->accelerated_widget_mac();
|
||||||
@@ -417,8 +423,13 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {}
|
@@ -417,8 +423,13 @@ SkColor BrowserCompositorMac::DelegatedFrameHostGetGutterColor(
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const {
|
gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const {
|
||||||
|
|||||||
@@ -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 97ea047..8a4e4d4 100644
|
index 290514b..c638c29 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
|
||||||
@@ -316,14 +316,20 @@ void BrowserPluginGuest::InitInternal(
|
@@ -316,14 +316,20 @@ void BrowserPluginGuest::InitInternal(
|
||||||
@@ -25,7 +25,7 @@ index 97ea047..8a4e4d4 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
RendererPreferences* renderer_prefs =
|
RendererPreferences* renderer_prefs =
|
||||||
@@ -791,7 +797,8 @@ void BrowserPluginGuest::OnWillAttachComplete(
|
@@ -806,7 +812,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(
|
||||||
@@ -132,7 +132,7 @@ index 86ce68b..fd21e5a 100644
|
|||||||
RenderWidgetHost* render_widget_host) override;
|
RenderWidgetHost* render_widget_host) override;
|
||||||
void SetPageTitle(const base::string16& title) override;
|
void SetPageTitle(const base::string16& title) override;
|
||||||
diff --git content/browser/web_contents/web_contents_view_guest.cc content/browser/web_contents/web_contents_view_guest.cc
|
diff --git content/browser/web_contents/web_contents_view_guest.cc content/browser/web_contents/web_contents_view_guest.cc
|
||||||
index b2b86fa..00c9126 100644
|
index a93bc37..18fed2e 100644
|
||||||
--- content/browser/web_contents/web_contents_view_guest.cc
|
--- content/browser/web_contents/web_contents_view_guest.cc
|
||||||
+++ content/browser/web_contents/web_contents_view_guest.cc
|
+++ content/browser/web_contents/web_contents_view_guest.cc
|
||||||
@@ -72,6 +72,8 @@ void WebContentsViewGuest::GetScreenInfo(ScreenInfo* screen_info) const {
|
@@ -72,6 +72,8 @@ void WebContentsViewGuest::GetScreenInfo(ScreenInfo* screen_info) const {
|
||||||
@@ -153,7 +153,7 @@ index b2b86fa..00c9126 100644
|
|||||||
old_parent_view->GetNativeView()->RemoveChild(
|
old_parent_view->GetNativeView()->RemoveChild(
|
||||||
platform_view_->GetNativeView());
|
platform_view_->GetNativeView());
|
||||||
#endif // defined(USE_AURA)
|
#endif // defined(USE_AURA)
|
||||||
@@ -133,7 +137,8 @@ void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
|
@@ -134,7 +138,8 @@ void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
|
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
|
||||||
@@ -163,7 +163,7 @@ index b2b86fa..00c9126 100644
|
|||||||
if (render_widget_host->GetView()) {
|
if (render_widget_host->GetView()) {
|
||||||
// During testing, the view will already be set up in most cases to the
|
// 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
|
// test view, so we don't want to clobber it with a real one. To verify that
|
||||||
@@ -145,11 +150,19 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
|
@@ -146,11 +151,19 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
|
||||||
render_widget_host->GetView());
|
render_widget_host->GetView());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -455,7 +455,7 @@ index 7df66ea..4ee709a 100644
|
|||||||
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
|
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
|
||||||
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
|
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
|
||||||
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
|
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
|
||||||
@@ -40,9 +43,10 @@
|
@@ -40,9 +43,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
|
||||||
|
|
||||||
if (initial_client) {
|
if (initial_client) {
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
@@ -469,7 +469,7 @@ index 7df66ea..4ee709a 100644
|
|||||||
|
|
||||||
// Is there a way to recover if this fails?
|
// Is there a way to recover if this fails?
|
||||||
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
||||||
@@ -54,16 +58,27 @@
|
@@ -54,16 +58,27 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
|
||||||
// crash server won't have symbols for any other build types.
|
// crash server won't have symbols for any other build types.
|
||||||
std::string url = "https://clients2.google.com/cr/report";
|
std::string url = "https://clients2.google.com/cr/report";
|
||||||
#else
|
#else
|
||||||
@@ -502,7 +502,7 @@ index 7df66ea..4ee709a 100644
|
|||||||
|
|
||||||
#if defined(GOOGLE_CHROME_BUILD)
|
#if defined(GOOGLE_CHROME_BUILD)
|
||||||
NSString* channel = base::mac::ObjCCast<NSString>(
|
NSString* channel = base::mac::ObjCCast<NSString>(
|
||||||
@@ -73,12 +88,16 @@
|
@@ -73,12 +88,16 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -524,7 +524,7 @@ index 7df66ea..4ee709a 100644
|
|||||||
|
|
||||||
std::vector<std::string> arguments;
|
std::vector<std::string> arguments;
|
||||||
if (!browser_process) {
|
if (!browser_process) {
|
||||||
@@ -90,6 +109,12 @@
|
@@ -90,6 +109,12 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
|
||||||
"--reset-own-crash-exception-port-to-system-default");
|
"--reset-own-crash-exception-port-to-system-default");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git input_method_win.cc input_method_win.cc
|
diff --git input_method_win.cc input_method_win.cc
|
||||||
index 49efa46..c9eb806 100644
|
index e2bb528..3e851e5 100644
|
||||||
--- input_method_win.cc
|
--- input_method_win.cc
|
||||||
+++ input_method_win.cc
|
+++ input_method_win.cc
|
||||||
@@ -664,8 +664,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
|
@@ -682,8 +682,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
|
||||||
// receiving keyboard input as long as it is an active window. This works well
|
// receiving keyboard input as long as it is an active window. This works well
|
||||||
// even when the |attached_window_handle| becomes active but has not received
|
// even when the |attached_window_handle| becomes active but has not received
|
||||||
// WM_FOCUS yet.
|
// WM_FOCUS yet.
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
|
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
|
||||||
index ffe235a..e7bf4be 100644
|
index f080d7c..c172f54 100644
|
||||||
--- public/common/common_param_traits_macros.h
|
--- public/common/common_param_traits_macros.h
|
||||||
+++ public/common/common_param_traits_macros.h
|
+++ public/common/common_param_traits_macros.h
|
||||||
@@ -202,6 +202,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
|
@@ -203,6 +203,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
|
||||||
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
|
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
|
||||||
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
|
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
|
||||||
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
|
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
|
||||||
@@ -11,10 +11,10 @@ index ffe235a..e7bf4be 100644
|
|||||||
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
|
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
|
||||||
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
|
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
|
||||||
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
|
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
|
||||||
index 7f24f09..ab0fe0d 100644
|
index e99b4b0..5024b68 100644
|
||||||
--- public/common/web_preferences.cc
|
--- public/common/web_preferences.cc
|
||||||
+++ public/common/web_preferences.cc
|
+++ public/common/web_preferences.cc
|
||||||
@@ -172,6 +172,7 @@ WebPreferences::WebPreferences()
|
@@ -173,6 +173,7 @@ WebPreferences::WebPreferences()
|
||||||
spatial_navigation_enabled(false),
|
spatial_navigation_enabled(false),
|
||||||
use_solid_color_scrollbars(false),
|
use_solid_color_scrollbars(false),
|
||||||
navigate_on_drag_drop(true),
|
navigate_on_drag_drop(true),
|
||||||
@@ -23,10 +23,10 @@ index 7f24f09..ab0fe0d 100644
|
|||||||
inert_visual_viewport(false),
|
inert_visual_viewport(false),
|
||||||
record_whole_document(false),
|
record_whole_document(false),
|
||||||
diff --git public/common/web_preferences.h public/common/web_preferences.h
|
diff --git public/common/web_preferences.h public/common/web_preferences.h
|
||||||
index 4835144..16fa0ad 100644
|
index 08b70a9..9fadfbb 100644
|
||||||
--- public/common/web_preferences.h
|
--- public/common/web_preferences.h
|
||||||
+++ public/common/web_preferences.h
|
+++ public/common/web_preferences.h
|
||||||
@@ -186,6 +186,7 @@ struct CONTENT_EXPORT WebPreferences {
|
@@ -187,6 +187,7 @@ struct CONTENT_EXPORT WebPreferences {
|
||||||
bool spatial_navigation_enabled;
|
bool spatial_navigation_enabled;
|
||||||
bool use_solid_color_scrollbars;
|
bool use_solid_color_scrollbars;
|
||||||
bool navigate_on_drag_drop;
|
bool navigate_on_drag_drop;
|
||||||
@@ -35,10 +35,10 @@ index 4835144..16fa0ad 100644
|
|||||||
bool inert_visual_viewport;
|
bool inert_visual_viewport;
|
||||||
bool record_whole_document;
|
bool record_whole_document;
|
||||||
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
|
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
|
||||||
index 7742f44..c4fabdc 100644
|
index 6fedecf..9d003a2 100644
|
||||||
--- renderer/render_view_impl.cc
|
--- renderer/render_view_impl.cc
|
||||||
+++ renderer/render_view_impl.cc
|
+++ renderer/render_view_impl.cc
|
||||||
@@ -1390,6 +1390,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
|
@@ -1391,6 +1391,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);
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ index 7ec0135..9f68626 100644
|
|||||||
using content::NavigationController;
|
using content::NavigationController;
|
||||||
using content::NavigationEntry;
|
using content::NavigationEntry;
|
||||||
using content::OpenURLParams;
|
using content::OpenURLParams;
|
||||||
@@ -231,11 +235,15 @@ - (void)handlesStopScriptCommand:(NSScriptCommand*)command {
|
@@ -231,11 +235,15 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,
|
||||||
|
|
||||||
- (void)handlesPrintScriptCommand:(NSScriptCommand*)command {
|
- (void)handlesPrintScriptCommand:(NSScriptCommand*)command {
|
||||||
AppleScript::LogAppleScriptUMA(AppleScript::AppleScriptCommand::TAB_PRINT);
|
AppleScript::LogAppleScriptUMA(AppleScript::AppleScriptCommand::TAB_PRINT);
|
||||||
@@ -178,7 +178,7 @@ index 3679499..b2d2544 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 3144c40..8679f72 100644
|
index 2ac27ae..ecb31d7 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
|
||||||
@@ -89,6 +89,9 @@ const float kPrintingMinimumShrinkFactor = 1.333f;
|
@@ -89,6 +89,9 @@ const float kPrintingMinimumShrinkFactor = 1.333f;
|
||||||
@@ -404,7 +404,7 @@ index 3144c40..8679f72 100644
|
|||||||
|
|
||||||
#if BUILDFLAG(ENABLE_BASIC_PRINTING)
|
#if BUILDFLAG(ENABLE_BASIC_PRINTING)
|
||||||
void PrintWebViewHelper::GetPrintSettingsFromUser(
|
void PrintWebViewHelper::GetPrintSettingsFromUser(
|
||||||
@@ -1884,7 +1863,6 @@ void PrintWebViewHelper::PrintPageInternal(
|
@@ -1889,7 +1868,6 @@ void PrintWebViewHelper::PrintPageInternal(
|
||||||
|
|
||||||
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
||||||
|
|
||||||
@@ -412,7 +412,7 @@ index 3144c40..8679f72 100644
|
|||||||
if (params.params.display_header_footer) {
|
if (params.params.display_header_footer) {
|
||||||
// TODO(thestig): Figure out why Linux needs this. It is almost certainly
|
// TODO(thestig): Figure out why Linux needs this. It is almost certainly
|
||||||
// |printingMinimumShrinkFactor| from Blink.
|
// |printingMinimumShrinkFactor| from Blink.
|
||||||
@@ -1899,7 +1877,6 @@ void PrintWebViewHelper::PrintPageInternal(
|
@@ -1904,7 +1882,6 @@ void PrintWebViewHelper::PrintPageInternal(
|
||||||
scale_factor / fudge_factor, page_layout_in_points,
|
scale_factor / fudge_factor, page_layout_in_points,
|
||||||
params.params);
|
params.params);
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ index 3144c40..8679f72 100644
|
|||||||
|
|
||||||
float webkit_scale_factor =
|
float webkit_scale_factor =
|
||||||
RenderPageContent(frame, params.page_number, canvas_area, content_area,
|
RenderPageContent(frame, params.page_number, canvas_area, content_area,
|
||||||
@@ -1935,7 +1912,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
|
@@ -1940,7 +1917,6 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -428,7 +428,7 @@ index 3144c40..8679f72 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;
|
||||||
@@ -2066,7 +2042,6 @@ bool PrintWebViewHelper::PreviewPageRendered(int page_number,
|
@@ -2071,7 +2047,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;
|
||||||
}
|
}
|
||||||
@@ -537,7 +537,7 @@ diff --git components/printing/renderer/print_web_view_helper_mac.mm components/
|
|||||||
index ff49472..b107439 100644
|
index ff49472..b107439 100644
|
||||||
--- components/printing/renderer/print_web_view_helper_mac.mm
|
--- components/printing/renderer/print_web_view_helper_mac.mm
|
||||||
+++ components/printing/renderer/print_web_view_helper_mac.mm
|
+++ components/printing/renderer/print_web_view_helper_mac.mm
|
||||||
@@ -69,7 +69,6 @@
|
@@ -69,7 +69,6 @@ void PrintWebViewHelper::PrintPageInternal(
|
||||||
Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
|
Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -545,7 +545,7 @@ index ff49472..b107439 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) {
|
||||||
@@ -106,7 +105,6 @@
|
@@ -106,7 +105,6 @@ bool PrintWebViewHelper::RenderPreviewPage(
|
||||||
}
|
}
|
||||||
return PreviewPageRendered(page_number, draft_metafile.get());
|
return PreviewPageRendered(page_number, draft_metafile.get());
|
||||||
}
|
}
|
||||||
@@ -553,7 +553,7 @@ index ff49472..b107439 100644
|
|||||||
|
|
||||||
void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
|
void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
|
||||||
int page_number,
|
int page_number,
|
||||||
@@ -142,14 +140,12 @@
|
@@ -142,14 +140,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
|
||||||
|
|
||||||
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
||||||
skia::SetIsPreviewMetafile(*canvas, is_preview);
|
skia::SetIsPreviewMetafile(*canvas, is_preview);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
|
|||||||
index c91614f..622c839 100644
|
index c91614f..622c839 100644
|
||||||
--- render_widget_host_view_mac.mm
|
--- render_widget_host_view_mac.mm
|
||||||
+++ render_widget_host_view_mac.mm
|
+++ render_widget_host_view_mac.mm
|
||||||
@@ -462,9 +462,6 @@ float FlipYFromRectToScreen(float y, float rect_height) {
|
@@ -462,9 +462,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
|
||||||
// Paint this view host with |background_color_| when there is no content
|
// Paint this view host with |background_color_| when there is no content
|
||||||
// ready to draw.
|
// ready to draw.
|
||||||
background_layer_.reset([[CALayer alloc] init]);
|
background_layer_.reset([[CALayer alloc] init]);
|
||||||
|
|||||||
@@ -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
|
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
index ddbf5a2..600e94c5 100644
|
index 614cf33..d873ed9 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||||
@@ -746,8 +746,10 @@ void RenderWidgetHostViewAura::SetBackgroundColor(SkColor color) {
|
@@ -746,8 +746,10 @@ void RenderWidgetHostViewAura::SetBackgroundColor(SkColor color) {
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ index 2907619..c7a36ea 100644
|
|||||||
|
|
||||||
SupervisedUserSettingsServiceFactory();
|
SupervisedUserSettingsServiceFactory();
|
||||||
diff --git chrome/browser/ui/prefs/prefs_tab_helper.cc chrome/browser/ui/prefs/prefs_tab_helper.cc
|
diff --git chrome/browser/ui/prefs/prefs_tab_helper.cc chrome/browser/ui/prefs/prefs_tab_helper.cc
|
||||||
index 72267d2..5146b39 100644
|
index 8c3e178..2353d06 100644
|
||||||
--- chrome/browser/ui/prefs/prefs_tab_helper.cc
|
--- chrome/browser/ui/prefs/prefs_tab_helper.cc
|
||||||
+++ chrome/browser/ui/prefs/prefs_tab_helper.cc
|
+++ chrome/browser/ui/prefs/prefs_tab_helper.cc
|
||||||
@@ -11,8 +11,8 @@
|
@@ -11,8 +11,8 @@
|
||||||
@@ -110,7 +110,7 @@ index 72267d2..5146b39 100644
|
|||||||
#include "base/strings/string_number_conversions.h"
|
#include "base/strings/string_number_conversions.h"
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
#include "base/strings/stringprintf.h"
|
#include "base/strings/stringprintf.h"
|
||||||
@@ -431,12 +431,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
|
@@ -432,12 +432,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
|
||||||
GetInstance()->GetServiceForBrowserContext(profile, true));
|
GetInstance()->GetServiceForBrowserContext(profile, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ index 72267d2..5146b39 100644
|
|||||||
|
|
||||||
PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
|
PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
|
||||||
"PrefWatcher",
|
"PrefWatcher",
|
||||||
@@ -457,6 +455,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
|
@@ -458,6 +456,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
|
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
|
||||||
index 0755f27..76ad6d6 100644
|
index 0755f27..ca5b048 100644
|
||||||
--- ui/base/models/menu_model.h
|
--- ui/base/models/menu_model.h
|
||||||
+++ ui/base/models/menu_model.h
|
+++ ui/base/models/menu_model.h
|
||||||
@@ -15,6 +15,7 @@
|
@@ -15,6 +15,7 @@
|
||||||
@@ -42,7 +42,7 @@ index 0755f27..76ad6d6 100644
|
|||||||
virtual void MenuWillShow() {}
|
virtual void MenuWillShow() {}
|
||||||
|
|
||||||
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
|
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
|
||||||
index 78bc651..50a0231 100644
|
index 78bc651..304aaa6 100644
|
||||||
--- ui/gfx/render_text.cc
|
--- ui/gfx/render_text.cc
|
||||||
+++ ui/gfx/render_text.cc
|
+++ ui/gfx/render_text.cc
|
||||||
@@ -592,6 +592,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
|
@@ -592,6 +592,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
|
||||||
@@ -117,7 +117,7 @@ index 21891fc..97f148c 100644
|
|||||||
if (style_ == STYLE_BUTTON && PlatformStyle::kDefaultLabelButtonHasBoldFont) {
|
if (style_ == STYLE_BUTTON && PlatformStyle::kDefaultLabelButtonHasBoldFont) {
|
||||||
// Some text appears wider when rendered normally than when rendered bold.
|
// Some text appears wider when rendered normally than when rendered bold.
|
||||||
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
||||||
index 9b04c09..58066c14 100644
|
index 9b04c09..05c47ee 100644
|
||||||
--- ui/views/controls/label.cc
|
--- ui/views/controls/label.cc
|
||||||
+++ ui/views/controls/label.cc
|
+++ ui/views/controls/label.cc
|
||||||
@@ -28,6 +28,7 @@
|
@@ -28,6 +28,7 @@
|
||||||
@@ -215,10 +215,10 @@ index 6293cff..d0a5a8f 100644
|
|||||||
// TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is
|
// TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is
|
||||||
// closed.
|
// closed.
|
||||||
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
||||||
index 79ff77c..a0582c0 100644
|
index 37db59d..f6a99cf 100644
|
||||||
--- ui/views/controls/menu/menu_controller.cc
|
--- ui/views/controls/menu/menu_controller.cc
|
||||||
+++ ui/views/controls/menu/menu_controller.cc
|
+++ ui/views/controls/menu/menu_controller.cc
|
||||||
@@ -2254,8 +2254,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
@@ -2270,8 +2270,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
||||||
|
|
||||||
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
MenuItemView* item = pending_state_.item;
|
MenuItemView* item = pending_state_.item;
|
||||||
@@ -233,7 +233,7 @@ index 79ff77c..a0582c0 100644
|
|||||||
MenuItemView* to_select = NULL;
|
MenuItemView* to_select = NULL;
|
||||||
if (item->GetSubmenu()->GetMenuItemCount() > 0)
|
if (item->GetSubmenu()->GetMenuItemCount() > 0)
|
||||||
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
|
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
|
||||||
@@ -2270,8 +2275,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
@@ -2286,8 +2291,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
void MenuController::CloseSubmenu() {
|
void MenuController::CloseSubmenu() {
|
||||||
MenuItemView* item = state_.item;
|
MenuItemView* item = state_.item;
|
||||||
DCHECK(item);
|
DCHECK(item);
|
||||||
@@ -246,7 +246,7 @@ index 79ff77c..a0582c0 100644
|
|||||||
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
|
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
|
||||||
else if (item->GetParentMenuItem()->GetParentMenuItem())
|
else if (item->GetParentMenuItem()->GetParentMenuItem())
|
||||||
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
|
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
|
||||||
index 3b7cb7f..7481553 100644
|
index 3b7cb7f..f945683 100644
|
||||||
--- ui/views/controls/menu/menu_delegate.h
|
--- ui/views/controls/menu/menu_delegate.h
|
||||||
+++ ui/views/controls/menu/menu_delegate.h
|
+++ ui/views/controls/menu/menu_delegate.h
|
||||||
@@ -87,6 +87,14 @@ class VIEWS_EXPORT MenuDelegate {
|
@@ -87,6 +87,14 @@ class VIEWS_EXPORT MenuDelegate {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||||
index 35b6f47..932fe44 100644
|
index ea0069b..acc6d10 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
|
||||||
@@ -1560,6 +1560,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
@@ -1563,6 +1563,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||||
std::string unique_name;
|
std::string unique_name;
|
||||||
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
|
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ index 35b6f47..932fe44 100644
|
|||||||
WebContentsViewDelegate* delegate =
|
WebContentsViewDelegate* delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -1570,6 +1576,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
@@ -1573,6 +1579,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||||
view_.reset(CreateWebContentsView(this, delegate,
|
view_.reset(CreateWebContentsView(this, delegate,
|
||||||
&render_view_host_delegate_view_));
|
&render_view_host_delegate_view_));
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ index 35b6f47..932fe44 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(),
|
||||||
@@ -2075,6 +2082,12 @@ void WebContentsImpl::CreateNewWindow(
|
@@ -2078,6 +2085,12 @@ 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;
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ index 35b6f47..932fe44 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();
|
||||||
@@ -2104,7 +2117,7 @@ void WebContentsImpl::CreateNewWindow(
|
@@ -2107,7 +2120,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(
|
||||||
@@ -45,7 +45,7 @@ index 35b6f47..932fe44 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.
|
||||||
@@ -4989,7 +5002,7 @@ NavigationEntry*
|
@@ -5003,7 +5016,7 @@ NavigationEntry*
|
||||||
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
|
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
|
||||||
RenderViewHost* render_view_host) {
|
RenderViewHost* render_view_host) {
|
||||||
RenderWidgetHostViewBase* rwh_view =
|
RenderWidgetHostViewBase* rwh_view =
|
||||||
@@ -70,7 +70,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 a5e2535..704c137 100644
|
index 041c883..34aff7a 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
|
||||||
@@ -59,9 +59,11 @@ class PageState;
|
@@ -59,9 +59,11 @@ class PageState;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ index 11d980e..a87fb7e 100644
|
|||||||
|
|
||||||
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
|
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
|
||||||
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
|
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
|
||||||
index 24a1fbf..b51ca5f 100644
|
index 2476a72..ee13747 100644
|
||||||
--- Source/web/WebViewImpl.cpp
|
--- Source/web/WebViewImpl.cpp
|
||||||
+++ Source/web/WebViewImpl.cpp
|
+++ Source/web/WebViewImpl.cpp
|
||||||
@@ -358,6 +358,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
|
@@ -358,6 +358,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
|
||||||
@@ -23,7 +23,7 @@ index 24a1fbf..b51ca5f 100644
|
|||||||
m_compositorDeviceScaleFactorOverride(0),
|
m_compositorDeviceScaleFactorOverride(0),
|
||||||
m_suppressNextKeypressEvent(false),
|
m_suppressNextKeypressEvent(false),
|
||||||
m_imeAcceptEvents(true),
|
m_imeAcceptEvents(true),
|
||||||
@@ -3704,8 +3705,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() {
|
@@ -3695,8 +3696,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() {
|
||||||
m_devToolsEmulator->mainFrameScrollOrScaleChanged();
|
m_devToolsEmulator->mainFrameScrollOrScaleChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||||
index 28e8a17..84a3814 100644
|
index 756e651..0d5aafd 100644
|
||||||
--- chrome/app/generated_resources.grd
|
--- chrome/app/generated_resources.grd
|
||||||
+++ chrome/app/generated_resources.grd
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -7137,7 +7137,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
@@ -7125,7 +7125,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||||
</message>
|
</message>
|
||||||
</if>
|
</if>
|
||||||
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
||||||
|
|||||||
Reference in New Issue
Block a user