Enable noshadowing in blink/core

Fix minor shadowing issues.

BUG=794619

Change-Id: I0656c25c13be3e7652122e1b1b1ded282f352da1
Reviewed-on: https://chromium-review.googlesource.com/825903Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523975}

third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp

@@ -80,7 +80,6 @@ void LocalWindowProxy::DisposeContext(Lifecycle next_status,
   MainThreadDebugger::Instance()->ContextWillBeDestroyed(script_state_.get());
 
   if (next_status == Lifecycle::kGlobalObjectIsDetached) {
-    v8::Local<v8::Context> context = script_state_->GetContext();
     // Clean up state on the global proxy, which will be reused.
     if (!global_proxy_.IsEmpty()) {
       CHECK(global_proxy_ == context->Global());

third_party/WebKit/Source/bindings/core/v8/custom/V8DevToolsHostCustom.cpp

@@ -83,9 +83,8 @@ static bool PopulateContextMenuItems(v8::Isolate* isolate,
       continue;
     String type_string = ToCoreStringWithNullCheck(type.As<v8::String>());
     if (type_string == "separator") {
-      ContextMenuItem item(ContextMenuItem(
+      menu.AppendItem(ContextMenuItem(
           kSeparatorType, kContextMenuItemCustomTagNoAction, String()));
-      menu.AppendItem(item);
     } else if (type_string == "subMenu" && sub_items->IsArray()) {
       ContextMenu sub_menu;
       v8::Local<v8::Array> sub_items_array =
@@ -94,9 +93,9 @@ static bool PopulateContextMenuItems(v8::Isolate* isolate,
         return false;
       TOSTRING_DEFAULT(V8StringResource<kTreatNullAsNullString>, label_string,
                        label, false);
-      ContextMenuItem item(kSubmenuType, kContextMenuItemCustomTagNoAction,
-                           label_string, &sub_menu);
-      menu.AppendItem(item);
+      menu.AppendItem(ContextMenuItem(kSubmenuType,
+                                      kContextMenuItemCustomTagNoAction,
+                                      label_string, &sub_menu));
     } else {
       int32_t int32_id;
       if (!id->Int32Value(context).To(&int32_id))

third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp

@@ -277,10 +277,10 @@ ScriptWrappable* V8ScriptValueDeserializer::ReadDOMObject(
         // read the list of key pair values for color settings, etc.
         bool is_done = false;
         do {
-          ImageSerializationTag tag;
-          if (!ReadUint32Enum<ImageSerializationTag>(&tag))
+          ImageSerializationTag image_tag;
+          if (!ReadUint32Enum<ImageSerializationTag>(&image_tag))
             return nullptr;
-          switch (tag) {
+          switch (image_tag) {
             case ImageSerializationTag::kEndTag:
               is_done = true;
               break;
@@ -347,10 +347,10 @@ ScriptWrappable* V8ScriptValueDeserializer::ReadDOMObject(
       if (Version() >= 18) {
         bool is_done = false;
         do {
-          ImageSerializationTag tag;
-          if (!ReadUint32Enum<ImageSerializationTag>(&tag))
+          ImageSerializationTag image_tag;
+          if (!ReadUint32Enum<ImageSerializationTag>(&image_tag))
             return nullptr;
-          switch (tag) {
+          switch (image_tag) {
             case ImageSerializationTag::kEndTag:
               is_done = true;
               break;

third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

@@ -202,13 +202,13 @@ namespace blink {
   for (size_t i = 0; i < list.length(); ++i) {
     const CSSValuePair& pair = ToCSSValuePair(list.Item(i));
     AtomicString identifier(ToCSSCustomIdentValue(pair.First()).Value());
-    int value = ToCSSPrimitiveValue(pair.Second()).GetIntValue();
+    int counter_value = ToCSSPrimitiveValue(pair.Second()).GetIntValue();
     CounterDirectives& directives =
         map.insert(identifier, CounterDirectives()).stored_value->value;
     {% if action == 'Reset' %}
-    directives.SetResetValue(value);
+    directives.SetResetValue(counter_value);
     {% else %}
-    directives.AddIncrementValue(value);
+    directives.AddIncrementValue(counter_value);
     {% endif %}
   }
   DCHECK(!map.IsEmpty());

third_party/WebKit/Source/core/BUILD.gn

@@ -74,7 +74,10 @@ config("blink_core_pch") {
   }
 }
 
-core_config_add += [ ":blink_core_pch" ]
+core_config_add += [
+  ":blink_core_pch",
+  "//build/config/compiler:noshadowing",
+]
 
 source_set("generated") {
   deps = [

third_party/WebKit/Source/platform/loader/fetch/CachedMetadata.cpp

@@ -7,10 +7,8 @@
 namespace blink {
 
 CachedMetadata::CachedMetadata(const char* data, size_t size) {
-  // We need to define a local variable to use the constant in DCHECK.
-  constexpr auto kDataStart = CachedMetadata::kDataStart;
   // Serialized metadata should have non-empty data.
-  DCHECK_GT(size, kDataStart);
+  DCHECK_GT(size, kCachedMetaDataStart);
   DCHECK(data);
 
   serialized_data_.ReserveInitialCapacity(size);

third_party/WebKit/Source/platform/loader/fetch/CachedMetadata.h

@@ -40,6 +40,9 @@
 
 namespace blink {
 
+// |m_serializedData| consists of 32 bits type ID and and actual data.
+constexpr size_t kCachedMetaDataStart = sizeof(uint32_t);
+
 // Metadata retrieved from the embedding application's cache.
 //
 // Serialized data is NOT portable across architectures. However, reading the
@@ -63,23 +66,19 @@ class PLATFORM_EXPORT CachedMetadata : public RefCounted<CachedMetadata> {
   const Vector<char>& SerializedData() const { return serialized_data_; }
 
   uint32_t DataTypeID() const {
-    // We need to define a local variable to use the constant in DCHECK.
-    constexpr auto kDataStart = CachedMetadata::kDataStart;
-    DCHECK_GE(serialized_data_.size(), kDataStart);
+    DCHECK_GE(serialized_data_.size(), kCachedMetaDataStart);
     return *reinterpret_cast_ptr<uint32_t*>(
         const_cast<char*>(serialized_data_.data()));
   }
 
   const char* Data() const {
-    constexpr auto kDataStart = CachedMetadata::kDataStart;
-    DCHECK_GE(serialized_data_.size(), kDataStart);
-    return serialized_data_.data() + kDataStart;
+    DCHECK_GE(serialized_data_.size(), kCachedMetaDataStart);
+    return serialized_data_.data() + kCachedMetaDataStart;
   }
 
   size_t size() const {
-    constexpr auto kDataStart = CachedMetadata::kDataStart;
-    DCHECK_GE(serialized_data_.size(), kDataStart);
-    return serialized_data_.size() - kDataStart;
+    DCHECK_GE(serialized_data_.size(), kCachedMetaDataStart);
+    return serialized_data_.size() - kCachedMetaDataStart;
   }
 
  private:
@@ -89,9 +88,6 @@ class PLATFORM_EXPORT CachedMetadata : public RefCounted<CachedMetadata> {
   // Since the serialization format supports random access, storing it in
   // serialized form avoids need for a copy during serialization.
   Vector<char> serialized_data_;
-
-  // |m_serializedData| consists of 32 bits type ID and and actual data.
-  static constexpr size_t kDataStart = sizeof(uint32_t);
 };
 
 }  // namespace blink