Tweak |in_blink_namespace|, to look at ancestors *and also* at qualifiers.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Changes Blink-style names to Chrome-style names. Currently transforms:
 //   fields:
 //     int m_operationCount => int operation_count_
 //   variables (including parameters):
 //     int mySuperVariable => int my_super_variable
 //   constants:
@@ skipping 566 matching lines @@
   llvm::InitializeNativeTargetAsmParser();
   llvm::cl::OptionCategory category(
       "rewrite_to_chrome_style: convert Blink style to Chrome style.");
   CommonOptionsParser options(argc, argv, category);
   clang::tooling::ClangTool tool(options.getCompilations(),
                                  options.getSourcePathList());
 
   MatchFinder match_finder;
   std::set<Replacement> replacements;
 
-  auto in_blink_namespace =
-      decl(hasAncestor(namespaceDecl(anyOf(hasName("blink"), hasName("WTF")),
-                                     hasParent(translationUnitDecl()))),
-           unless(isExpansionInFileMatching(kGeneratedFileRegex)));
+  // Blink namespace matchers ========
+  auto blink_namespace_decl =
+      namespaceDecl(anyOf(hasName("blink"), hasName("WTF")),
+                    hasParent(translationUnitDecl()));
+
+  // Given top-level compilation unit:
+  //   namespace WTF {
+  //     void foo() {}
+  //   }
+  // matches |foo|.
+  auto decl_under_blink_namespace = decl(hasAncestor(blink_namespace_decl));
+
+  // Given top-level compilation unit:
+  //   void WTF::function() {}       // (1)
+  //   void WTF::Class::method() {}  // (2)

[dcheng, 2016/08/29 21:12:17]

As mentioned offline, this doesn't match something like
WTF::internal::Class::method. We could write a custom matcher, which would let
us simplify lines 605-606.

I leave it up to you if you want to do this or not: it's a "nice to have" but
almost certainly overkill.

(If we don't do it, perhaps update this comment to note that it only handles one
level of nesting though)

+  // matches |WTF::function| and |WTF::Class::method| decls.
+  auto decl_has_qualifier_to_blink_namespace =
+      declaratorDecl(has(nestedNameSpecifier(
+          anyOf(specifiesNamespace(blink_namespace_decl),                 // (1)
+                hasPrefix(specifiesNamespace(blink_namespace_decl))))));  // (2)
+
+  auto in_blink_namespace = decl(
+      anyOf(decl_under_blink_namespace, decl_has_qualifier_to_blink_namespace,
+            hasAncestor(decl_has_qualifier_to_blink_namespace)),
+      unless(isExpansionInFileMatching(kGeneratedFileRegex)));
 
   // Field, variable, and enum declarations ========
   // Given
   //   int x;
   //   struct S {
   //     int y;
   //     enum { VALUE };
   //   };
   // matches |x|, |y|, and |VALUE|.
   auto field_decl_matcher = id("decl", fieldDecl(in_blink_namespace));
@@ skipping 278 matching lines @@
   for (const auto& r : replacements) {
     std::string replacement_text = r.getReplacementText().str();
     std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
     llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
                  << ":::" << r.getLength() << ":::" << replacement_text << "\n";
   }
   llvm::outs() << "==== END EDITS ====\n";
 
   return 0;
 }