Commit aec30aaa authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

ios: Enable -Wmisleading-indentation for chromium_code.

While here, also remove some references to GYP.

Bug: 1031169
Change-Id: Ibb00ea755454be02b366f344d9bae8b693dbd581
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066060
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743109}
parent d6226d97
...@@ -1533,7 +1533,7 @@ config("default_warnings") { ...@@ -1533,7 +1533,7 @@ config("default_warnings") {
] ]
} }
if (is_ios || is_chromeos || is_chromecast) { if (is_chromeos || is_chromecast) {
cflags += [ cflags += [
# TODO(https://crbug.com/1031169): Clean up and enable. # TODO(https://crbug.com/1031169): Clean up and enable.
"-Wno-misleading-indentation", "-Wno-misleading-indentation",
...@@ -1993,13 +1993,12 @@ config("default_stack_frames") { ...@@ -1993,13 +1993,12 @@ config("default_stack_frames") {
# Default "optimization on" config. # Default "optimization on" config.
config("optimize") { config("optimize") {
if (is_win) { if (is_win) {
# Favor size over speed, /O1 must be before the common flags. The GYP # Favor size over speed, /O1 must be before the common flags.
# build also specifies /Os and /GF but these are implied by /O1. # /O1 implies /Os and /GF.
cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ] cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ]
# TODO(thakis): Use -flto in official builds here eventually, # TODO(thakis): Use -flto in official builds here eventually,
# https://crbug.com/598772 # https://crbug.com/598772
} else if (optimize_for_size && !is_nacl) { } else if (optimize_for_size && !is_nacl) {
# Favor size over speed. # Favor size over speed.
# TODO(crbug.com/718650): Fix -Os in PNaCl compiler and remove the is_nacl # TODO(crbug.com/718650): Fix -Os in PNaCl compiler and remove the is_nacl
# guard above. # guard above.
...@@ -2017,8 +2016,8 @@ config("optimize") { ...@@ -2017,8 +2016,8 @@ config("optimize") {
# Same config as 'optimize' but without the WPO flag. # Same config as 'optimize' but without the WPO flag.
config("optimize_no_wpo") { config("optimize_no_wpo") {
if (is_win) { if (is_win) {
# Favor size over speed, /O1 must be before the common flags. The GYP # Favor size over speed, /O1 must be before the common flags.
# build also specifies /Os and /GF but these are implied by /O1. # /O1 implies /Os and /GF.
cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ] cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ]
} else if (optimize_for_size && !is_nacl) { } else if (optimize_for_size && !is_nacl) {
# Favor size over speed. # Favor size over speed.
...@@ -2048,7 +2047,7 @@ config("no_optimize") { ...@@ -2048,7 +2047,7 @@ config("no_optimize") {
if (target_cpu == "arm64") { if (target_cpu == "arm64") {
# Disable omitting frame pointers for no_optimize build because stack # Disable omitting frame pointers for no_optimize build because stack
# trace on Windows ARM64 relies on it. # traces on Windows ARM64 rely on it.
cflags += [ "/Oy-" ] cflags += [ "/Oy-" ]
} }
} else if (is_android && !android_full_debug) { } else if (is_android && !android_full_debug) {
...@@ -2086,8 +2085,8 @@ config("optimize_max") { ...@@ -2086,8 +2085,8 @@ config("optimize_max") {
} else { } else {
ldflags = common_optimize_on_ldflags ldflags = common_optimize_on_ldflags
if (is_win) { if (is_win) {
# Favor speed over size, /O2 must be before the common flags. The GYP # Favor speed over size, /O2 must be before the common flags.
# build also specifies /Ot, /Oi, and /GF, but these are implied by /O2. # /O2 implies /Ot, /Oi, and /GF.
cflags = [ "/O2" ] + common_optimize_on_cflags cflags = [ "/O2" ] + common_optimize_on_cflags
if (is_official_build) { if (is_official_build) {
...@@ -2125,8 +2124,8 @@ config("optimize_speed") { ...@@ -2125,8 +2124,8 @@ config("optimize_speed") {
} else { } else {
ldflags = common_optimize_on_ldflags ldflags = common_optimize_on_ldflags
if (is_win) { if (is_win) {
# Favor speed over size, /O2 must be before the common flags. The GYP # Favor speed over size, /O2 must be before the common flags.
# build also specifies /Ot, /Oi, and /GF, but these are implied by /O2. # /O2 implies /Ot, /Oi, and /GF.
cflags = [ "/O2" ] + common_optimize_on_cflags cflags = [ "/O2" ] + common_optimize_on_cflags
# TODO(thakis): Remove is_clang here, https://crbug.com/598772 # TODO(thakis): Remove is_clang here, https://crbug.com/598772
......
...@@ -304,8 +304,8 @@ void OmniboxViewIOS::OnDidBeginEditing() { ...@@ -304,8 +304,8 @@ void OmniboxViewIOS::OnDidBeginEditing() {
// |controller_| is only forwarding the call to the BVC. This should only // |controller_| is only forwarding the call to the BVC. This should only
// happen when the omnibox is being focused and it starts showing the popup; // happen when the omnibox is being focused and it starts showing the popup;
// if the popup was already open, no need to call this. // if the popup was already open, no need to call this.
if (!popup_was_open_before_editing_began) if (!popup_was_open_before_editing_began)
controller_->OnSetFocus(); controller_->OnSetFocus();
} }
void OmniboxViewIOS::OnWillEndEditing() { void OmniboxViewIOS::OnWillEndEditing() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment