diff options
| author | brettw <brettw@chromium.org> | 2015-02-18 11:28:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-18 19:28:58 +0000 |
| commit | 1deb76bc64a51808cd3df93d8166f223241487fe (patch) | |
| tree | ba263ec469857e46401390a014eb89e6ea2c2f7f /content | |
| parent | 17beef666072b2a022752e67a8b23e616a76d038 (diff) | |
| download | chromium_src-1deb76bc64a51808cd3df93d8166f223241487fe.zip chromium_src-1deb76bc64a51808cd3df93d8166f223241487fe.tar.gz chromium_src-1deb76bc64a51808cd3df93d8166f223241487fe.tar.bz2 | |
Work on GN Win64 build.
Adds a new config to disable size_t -> int truncations and use it in various places where the x64 Windows build currently gives warnings.
This covers Chrome (except for Blink which has a separate patch) and the tests.
We should do a second pass to replace the existing instances of /wd4267 with this config.
Review URL: https://codereview.chromium.org/927363005
Cr-Commit-Position: refs/heads/master@{#316874}
Diffstat (limited to 'content')
| -rw-r--r-- | content/child/BUILD.gn | 5 | ||||
| -rw-r--r-- | content/common/BUILD.gn | 10 | ||||
| -rw-r--r-- | content/ppapi_plugin/broker_process_dispatcher.cc | 6 | ||||
| -rw-r--r-- | content/renderer/BUILD.gn | 5 |
4 files changed, 21 insertions, 5 deletions
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index 935db3f..1380fe1 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -97,7 +97,10 @@ source_set("child") { } } - configs += [ "//content:content_implementation" ] + configs += [ + "//content:content_implementation", + "//build/config/compiler:no_size_t_to_int_warning", + ] if (is_ios) { # iOS only needs a small portion of content; exclude all the diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 6bf0f64..9ca66d2 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -130,7 +130,10 @@ source_set("common") { ".", "//content") - configs += [ "//content:content_implementation" ] + configs += [ + "//content:content_implementation", + "//build/config/compiler:no_size_t_to_int_warning", + ] public_deps = [ "//gpu/command_buffer/common", @@ -453,6 +456,11 @@ source_set("common") { ] } } + + if (is_win && cpu_arch == "x64") { + # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. + cflags = [ "/bigobj" ] + } } mojom("mojo_bindings") { diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc index 35d5b9d..97d4250 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.cc +++ b/content/ppapi_plugin/broker_process_dispatcher.cc @@ -309,14 +309,16 @@ bool BrokerProcessDispatcher::SetSitePermission( if (flash_browser_operations_1_3_) { PP_Bool result = flash_browser_operations_1_3_->SetSitePermission( - data_str.c_str(), setting_type, sites.size(), site_array.get()); + data_str.c_str(), setting_type, + static_cast<uint32_t>(sites.size()), site_array.get()); return PP_ToBool(result); } if (flash_browser_operations_1_2_) { PP_Bool result = flash_browser_operations_1_2_->SetSitePermission( - data_str.c_str(), setting_type, sites.size(), site_array.get()); + data_str.c_str(), setting_type, + static_cast<uint32_t>(sites.size()), site_array.get()); return PP_ToBool(result); } diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 1d64305..73445e1 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -16,7 +16,10 @@ source_set("renderer") { ".", "//content") - configs += [ "//content:content_implementation" ] + configs += [ + "//content:content_implementation", + "//build/config/compiler:no_size_t_to_int_warning", + ] deps = [ # TODO(GYP) bug 376846 remove this. This should be inherited from //net but |