Avoid duplicate functions: one AddStringToDigestor is enough

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

 // Copyright 2014 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.
 
 #include "core/inspector/InspectorAnimationAgent.h"
 
 #include <memory>
 #include "bindings/core/v8/V8BindingForCore.h"
 #include "core/animation/Animation.h"
 #include "core/animation/AnimationEffectReadOnly.h"
@@ skipping 436 matching lines @@
     CSSPropertyAnimationDelay,          CSSPropertyAnimationDirection,
     CSSPropertyAnimationDuration,       CSSPropertyAnimationFillMode,
     CSSPropertyAnimationIterationCount, CSSPropertyAnimationName,
     CSSPropertyAnimationTimingFunction};
 
 static CSSPropertyID g_transition_properties[] = {
     CSSPropertyTransitionDelay, CSSPropertyTransitionDuration,
     CSSPropertyTransitionProperty, CSSPropertyTransitionTimingFunction,
 };
 
-static void AddStringToDigestor(WebCryptoDigestor* digestor,
-                                const String& string) {
+static void AddAsciiStringToDigestor(WebCryptoDigestor* digestor,
+                                     const String& string) {
   digestor->Consume(
       reinterpret_cast<const unsigned char*>(string.Ascii().data()),
       string.length());

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

ditto.

 }
 
 String InspectorAnimationAgent::CreateCSSId(blink::Animation& animation) {
   String type =
       id_to_animation_type_.at(String::Number(animation.SequenceNumber()));
   DCHECK_NE(type, AnimationType::WebAnimation);
 
   KeyframeEffectReadOnly* effect = ToKeyframeEffectReadOnly(animation.effect());
   Vector<CSSPropertyID> css_properties;
   if (type == AnimationType::CSSAnimation) {
     for (CSSPropertyID property : g_animation_properties)
       css_properties.push_back(property);
   } else {
     for (CSSPropertyID property : g_transition_properties)
       css_properties.push_back(property);
     css_properties.push_back(cssPropertyID(animation.id()));
   }
 
   Element* element = effect->Target();
   HeapVector<Member<CSSStyleDeclaration>> styles =
       css_agent_->MatchingStyles(element);
   std::unique_ptr<WebCryptoDigestor> digestor =
       CreateDigestor(kHashAlgorithmSha1);
-  AddStringToDigestor(digestor.get(), type);
-  AddStringToDigestor(digestor.get(), animation.id());
+  AddAsciiStringToDigestor(digestor.get(), type);
+  AddAsciiStringToDigestor(digestor.get(), animation.id());
   for (CSSPropertyID property : css_properties) {
     CSSStyleDeclaration* style =
         css_agent_->FindEffectiveDeclaration(property, styles);
     // Ignore inline styles.
     if (!style || !style->ParentStyleSheet() || !style->parentRule() ||
         style->parentRule()->type() != CSSRule::kStyleRule)
       continue;
-    AddStringToDigestor(digestor.get(), getPropertyNameString(property));
-    AddStringToDigestor(digestor.get(),
-                        css_agent_->StyleSheetId(style->ParentStyleSheet()));
-    AddStringToDigestor(digestor.get(),
-                        ToCSSStyleRule(style->parentRule())->selectorText());
+    AddAsciiStringToDigestor(digestor.get(), getPropertyNameString(property));
+    AddAsciiStringToDigestor(
+        digestor.get(), css_agent_->StyleSheetId(style->ParentStyleSheet()));
+    AddAsciiStringToDigestor(
+        digestor.get(), ToCSSStyleRule(style->parentRule())->selectorText());
   }
   DigestValue digest_result;
   FinishDigestor(digestor.get(), digest_result);
   return Base64Encode(reinterpret_cast<const char*>(digest_result.data()), 10);
 }
 
 void InspectorAnimationAgent::DidCreateAnimation(unsigned sequence_number) {
   if (is_cloning_)
     return;
   GetFrontend()->animationCreated(String::Number(sequence_number));
@@ skipping 55 matching lines @@
 
 DEFINE_TRACE(InspectorAnimationAgent) {
   visitor->Trace(inspected_frames_);
   visitor->Trace(css_agent_);
   visitor->Trace(id_to_animation_);
   visitor->Trace(id_to_animation_clone_);
   InspectorBaseAgent::Trace(visitor);
 }
 
 }  // namespace blink