Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp

Issue 2800133003: Avoid duplicate functions: one AddStringToDigestor is enough (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/inspector/InspectorAnimationAgent.h" 5 #include "core/inspector/InspectorAnimationAgent.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include "bindings/core/v8/V8Binding.h" 8 #include "bindings/core/v8/V8Binding.h"
9 #include "core/animation/Animation.h" 9 #include "core/animation/Animation.h"
10 #include "core/animation/AnimationEffectReadOnly.h" 10 #include "core/animation/AnimationEffectReadOnly.h"
11 #include "core/animation/AnimationEffectTiming.h" 11 #include "core/animation/AnimationEffectTiming.h"
12 #include "core/animation/ComputedTimingProperties.h" 12 #include "core/animation/ComputedTimingProperties.h"
13 #include "core/animation/EffectModel.h" 13 #include "core/animation/EffectModel.h"
14 #include "core/animation/ElementAnimation.h" 14 #include "core/animation/ElementAnimation.h"
15 #include "core/animation/KeyframeEffectModel.h" 15 #include "core/animation/KeyframeEffectModel.h"
16 #include "core/animation/KeyframeEffectReadOnly.h" 16 #include "core/animation/KeyframeEffectReadOnly.h"
17 #include "core/animation/StringKeyframe.h" 17 #include "core/animation/StringKeyframe.h"
18 #include "core/css/CSSKeyframeRule.h" 18 #include "core/css/CSSKeyframeRule.h"
19 #include "core/css/CSSKeyframesRule.h" 19 #include "core/css/CSSKeyframesRule.h"
20 #include "core/css/CSSRuleList.h" 20 #include "core/css/CSSRuleList.h"
21 #include "core/css/CSSStyleRule.h" 21 #include "core/css/CSSStyleRule.h"
22 #include "core/css/resolver/StyleResolver.h" 22 #include "core/css/resolver/StyleResolver.h"
23 #include "core/dom/DOMNodeIds.h" 23 #include "core/dom/DOMNodeIds.h"
24 #include "core/dom/NodeComputedStyle.h" 24 #include "core/dom/NodeComputedStyle.h"
25 #include "core/frame/LocalFrame.h" 25 #include "core/frame/LocalFrame.h"
26 #include "core/inspector/InspectedFrames.h" 26 #include "core/inspector/InspectedFrames.h"
27 #include "core/inspector/InspectorCSSAgent.h" 27 #include "core/inspector/InspectorCSSAgent.h"
28 #include "core/inspector/InspectorStyleSheet.h" 28 #include "core/inspector/InspectorStyleSheet.h"
29 #include "core/inspector/V8InspectorString.h" 29 #include "core/inspector/V8InspectorString.h"
30 #include "core/inspector/addStringToDigestor.h"
30 #include "platform/Decimal.h" 31 #include "platform/Decimal.h"
31 #include "platform/animation/TimingFunction.h" 32 #include "platform/animation/TimingFunction.h"
32 #include "wtf/text/Base64.h" 33 #include "wtf/text/Base64.h"
33 34
34 namespace AnimationAgentState { 35 namespace AnimationAgentState {
35 static const char animationAgentEnabled[] = "animationAgentEnabled"; 36 static const char animationAgentEnabled[] = "animationAgentEnabled";
36 static const char animationAgentPlaybackRate[] = "animationAgentPlaybackRate"; 37 static const char animationAgentPlaybackRate[] = "animationAgentPlaybackRate";
37 } 38 }
38 39
39 namespace blink { 40 namespace blink {
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 CSSPropertyAnimationDelay, CSSPropertyAnimationDirection, 446 CSSPropertyAnimationDelay, CSSPropertyAnimationDirection,
446 CSSPropertyAnimationDuration, CSSPropertyAnimationFillMode, 447 CSSPropertyAnimationDuration, CSSPropertyAnimationFillMode,
447 CSSPropertyAnimationIterationCount, CSSPropertyAnimationName, 448 CSSPropertyAnimationIterationCount, CSSPropertyAnimationName,
448 CSSPropertyAnimationTimingFunction}; 449 CSSPropertyAnimationTimingFunction};
449 450
450 static CSSPropertyID transitionProperties[] = { 451 static CSSPropertyID transitionProperties[] = {
451 CSSPropertyTransitionDelay, CSSPropertyTransitionDuration, 452 CSSPropertyTransitionDelay, CSSPropertyTransitionDuration,
452 CSSPropertyTransitionProperty, CSSPropertyTransitionTimingFunction, 453 CSSPropertyTransitionProperty, CSSPropertyTransitionTimingFunction,
453 }; 454 };
454 455
455 static void addStringToDigestor(WebCryptoDigestor* digestor,
456 const String& string) {
457 digestor->consume(
458 reinterpret_cast<const unsigned char*>(string.ascii().data()),
459 string.length());
460 }
461
462 String InspectorAnimationAgent::createCSSId(blink::Animation& animation) { 456 String InspectorAnimationAgent::createCSSId(blink::Animation& animation) {
463 String type = 457 String type =
464 m_idToAnimationType.at(String::number(animation.sequenceNumber())); 458 m_idToAnimationType.at(String::number(animation.sequenceNumber()));
465 ASSERT(type != AnimationType::WebAnimation); 459 ASSERT(type != AnimationType::WebAnimation);
466 460
467 KeyframeEffectReadOnly* effect = toKeyframeEffectReadOnly(animation.effect()); 461 KeyframeEffectReadOnly* effect = toKeyframeEffectReadOnly(animation.effect());
468 Vector<CSSPropertyID> cssProperties; 462 Vector<CSSPropertyID> cssProperties;
469 if (type == AnimationType::CSSAnimation) { 463 if (type == AnimationType::CSSAnimation) {
470 for (CSSPropertyID property : animationProperties) 464 for (CSSPropertyID property : animationProperties)
471 cssProperties.push_back(property); 465 cssProperties.push_back(property);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 555
562 DEFINE_TRACE(InspectorAnimationAgent) { 556 DEFINE_TRACE(InspectorAnimationAgent) {
563 visitor->trace(m_inspectedFrames); 557 visitor->trace(m_inspectedFrames);
564 visitor->trace(m_cssAgent); 558 visitor->trace(m_cssAgent);
565 visitor->trace(m_idToAnimation); 559 visitor->trace(m_idToAnimation);
566 visitor->trace(m_idToAnimationClone); 560 visitor->trace(m_idToAnimationClone);
567 InspectorBaseAgent::trace(visitor); 561 InspectorBaseAgent::trace(visitor);
568 } 562 }
569 563
570 } // namespace blink 564 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698