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

Side by Side Diff: Source/core/animation/AnimationTest.cpp

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 "config.h" 5 #include "config.h"
6 #include "core/animation/Animation.h" 6 #include "core/animation/Animation.h"
7 7
8 #include "bindings/core/v8/Dictionary.h" 8 #include "bindings/core/v8/Dictionary.h"
9 #include "core/animation/AnimationClock.h" 9 #include "core/animation/AnimationClock.h"
10 #include "core/animation/AnimationHelpers.h" 10 #include "core/animation/AnimationHelpers.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 setV8ObjectPropertyAsString(keyframe1, "offset", "0"); 68 setV8ObjectPropertyAsString(keyframe1, "offset", "0");
69 setV8ObjectPropertyAsString(keyframe1, "easing", "ease-in-out"); 69 setV8ObjectPropertyAsString(keyframe1, "easing", "ease-in-out");
70 setV8ObjectPropertyAsString(keyframe2, "width", "0px"); 70 setV8ObjectPropertyAsString(keyframe2, "width", "0px");
71 setV8ObjectPropertyAsString(keyframe2, "offset", "1"); 71 setV8ObjectPropertyAsString(keyframe2, "offset", "1");
72 setV8ObjectPropertyAsString(keyframe2, "easing", "cubic-bezier(1, 1, 0.3, 0. 3)"); 72 setV8ObjectPropertyAsString(keyframe2, "easing", "cubic-bezier(1, 1, 0.3, 0. 3)");
73 73
74 jsKeyframes.append(Dictionary(keyframe1, m_isolate)); 74 jsKeyframes.append(Dictionary(keyframe1, m_isolate));
75 jsKeyframes.append(Dictionary(keyframe2, m_isolate)); 75 jsKeyframes.append(Dictionary(keyframe2, m_isolate));
76 76
77 String value1; 77 String value1;
78 ASSERT_TRUE(jsKeyframes[0].get("width", value1)); 78 ASSERT_TRUE(DictionaryHelper::get(jsKeyframes[0], "width", value1));
79 ASSERT_EQ("100px", value1); 79 ASSERT_EQ("100px", value1);
80 80
81 String value2; 81 String value2;
82 ASSERT_TRUE(jsKeyframes[1].get("width", value2)); 82 ASSERT_TRUE(DictionaryHelper::get(jsKeyframes[1], "width", value2));
83 ASSERT_EQ("0px", value2); 83 ASSERT_EQ("0px", value2);
84 84
85 RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsK eyframes, 0, exceptionState); 85 RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsK eyframes, 0, exceptionState);
86 86
87 Element* target = animation->target(); 87 Element* target = animation->target();
88 EXPECT_EQ(*element.get(), *target); 88 EXPECT_EQ(*element.get(), *target);
89 89
90 const KeyframeVector keyframes = toKeyframeEffectModelBase(animation->effect ())->getFrames(); 90 const KeyframeVector keyframes = toKeyframeEffectModelBase(animation->effect ())->getFrames();
91 91
92 EXPECT_EQ(0, keyframes[0]->offset()); 92 EXPECT_EQ(0, keyframes[0]->offset());
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 EXPECT_EQ(element.get(), animation->target()); 458 EXPECT_EQ(element.get(), animation->target());
459 document->timeline().play(animation.get()); 459 document->timeline().play(animation.get());
460 document.clear(); 460 document.clear();
461 element.clear(); 461 element.clear();
462 #if !ENABLE(OILPAN) 462 #if !ENABLE(OILPAN)
463 EXPECT_EQ(0, animation->target()); 463 EXPECT_EQ(0, animation->target());
464 #endif 464 #endif
465 } 465 }
466 466
467 } // namespace WebCore 467 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/tests/results/V8TestInterfaceEventConstructor.cpp ('k') | Source/core/animation/EffectInput.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698