From ffc93b75e1638e4b89f6ac2674ec3292ecb5deca Mon Sep 17 00:00:00 2001 From: avi Date: Mon, 7 Dec 2015 08:11:54 -0800 Subject: [PATCH] Revert of Enforce marking "override" for functions overriding Blink. (patchset #19 id:360001 of https://codereview.chromium.org/1370923002/ ) Reason for revert: Missed one. Original issue's description: > Enforce marking "override" for functions overriding Blink. > > BUG=535367 > TEST=it all stays working > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > TBR=ben@chromium.org > > Committed: https://crrev.com/32ff552858e014d454ce8b181f5aca1dfcf8f8fd > Cr-Commit-Position: refs/heads/master@{#363482} TBR=thakis@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=535367 Review URL: https://codereview.chromium.org/1504913002 Cr-Original-Commit-Position: refs/heads/master@{#363492} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 50e3df675d58385e566645effb6ccfd3c8562443 --- common.gypi | 3 +-- config/clang/BUILD.gn | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common.gypi b/common.gypi index 6b2cb0a6d..544f96411 100644 --- a/common.gypi +++ b/common.gypi @@ -2227,8 +2227,7 @@ 'clang_dynlib_flags%': '', }], ], - 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ' - '-Xclang -plugin-arg-find-bad-constructs -Xclang enforce-overriding-blink ', + 'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang check-templates ', }, # If you change these, also change build/config/clang/BUILD.gn. 'clang_chrome_plugins_flags%': diff --git a/config/clang/BUILD.gn b/config/clang/BUILD.gn index e5604314a..02c5f2ca9 100644 --- a/config/clang/BUILD.gn +++ b/config/clang/BUILD.gn @@ -40,10 +40,6 @@ config("find_bad_constructs") { "-plugin-arg-find-bad-constructs", "-Xclang", "check-templates", - "-Xclang", - "-plugin-arg-find-bad-constructs", - "-Xclang", - "enforce-overriding-blink", ] } }