Avoid duplicate functions: one AddStringToDigestor is enough

third_party/WebKit/Source/core/inspector/DOMPatchSupport.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 409 matching lines @@
       continue;
     }
 
     if (!dom_editor_->InsertBefore(parent_node, node, anchor_node,
                                    exception_state))
       return false;
   }
   return true;
 }
 
-static void AddStringToDigestor(WebCryptoDigestor* digestor,
-                                const String& string) {
+static void AddUtf8StringToDigestor(WebCryptoDigestor* digestor,
+                                    const String& string) {
   digestor->Consume(
       reinterpret_cast<const unsigned char*>(string.Utf8().data()),
       string.length());

[alph, 2017/07/10 21:26:06]

The length still doesn't match the data though. Could you please fix it?

 }
 
 DOMPatchSupport::Digest* DOMPatchSupport::CreateDigest(
     Node* node,
     UnusedNodesMap* unused_nodes_map) {
   Digest* digest = new Digest(node);
 
   std::unique_ptr<WebCryptoDigestor> digestor =
       CreateDigestor(kHashAlgorithmSha1);
   DigestValue digest_result;
 
   Node::NodeType node_type = node->getNodeType();
   digestor->Consume(reinterpret_cast<const unsigned char*>(&node_type),
                     sizeof(node_type));
-  AddStringToDigestor(digestor.get(), node->nodeName());
-  AddStringToDigestor(digestor.get(), node->nodeValue());
+  AddUtf8StringToDigestor(digestor.get(), node->nodeName());
+  AddUtf8StringToDigestor(digestor.get(), node->nodeValue());
 
   if (node->IsElementNode()) {
     Element& element = ToElement(*node);
     Node* child = element.firstChild();
     while (child) {
       Digest* child_info = CreateDigest(child, unused_nodes_map);
-      AddStringToDigestor(digestor.get(), child_info->sha1_);
+      AddUtf8StringToDigestor(digestor.get(), child_info->sha1_);
       child = child->nextSibling();
       digest->children_.push_back(child_info);
     }
 
     AttributeCollection attributes = element.AttributesWithoutUpdate();
     if (!attributes.IsEmpty()) {
       std::unique_ptr<WebCryptoDigestor> attrs_digestor =
           CreateDigestor(kHashAlgorithmSha1);
       for (auto& attribute : attributes) {
-        AddStringToDigestor(attrs_digestor.get(),
-                            attribute.GetName().ToString());
-        AddStringToDigestor(attrs_digestor.get(),
-                            attribute.Value().GetString());
+        AddUtf8StringToDigestor(attrs_digestor.get(),
+                                attribute.GetName().ToString());
+        AddUtf8StringToDigestor(attrs_digestor.get(),
+                                attribute.Value().GetString());
       }
       FinishDigestor(attrs_digestor.get(), digest_result);
       digest->attrs_sha1_ =
           Base64Encode(reinterpret_cast<const char*>(digest_result.data()), 10);
-      AddStringToDigestor(digestor.get(), digest->attrs_sha1_);
+      AddUtf8StringToDigestor(digestor.get(), digest->attrs_sha1_);
       digest_result.clear();
     }
   }
   FinishDigestor(digestor.get(), digest_result);
   digest->sha1_ =
       Base64Encode(reinterpret_cast<const char*>(digest_result.data()), 10);
 
   if (unused_nodes_map)
     unused_nodes_map->insert(digest->sha1_, digest);
   return digest;
@@ skipping 53 matching lines @@
       queue.push_back(first->children_[i].Get());
   }
 }
 
 DEFINE_TRACE(DOMPatchSupport::Digest) {
   visitor->Trace(node_);
   visitor->Trace(children_);
 }
 
 }  // namespace blink