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

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: Fixed LICENSE and windows build 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 "bindings/core/v8/DictionaryHelper.h"
9 #include "core/animation/AnimationClock.h" 10 #include "core/animation/AnimationClock.h"
10 #include "core/animation/AnimationHelpers.h" 11 #include "core/animation/AnimationHelpers.h"
11 #include "core/animation/AnimationNodeTiming.h" 12 #include "core/animation/AnimationNodeTiming.h"
12 #include "core/animation/AnimationTestHelper.h" 13 #include "core/animation/AnimationTestHelper.h"
13 #include "core/animation/AnimationTimeline.h" 14 #include "core/animation/AnimationTimeline.h"
14 #include "core/animation/KeyframeEffectModel.h" 15 #include "core/animation/KeyframeEffectModel.h"
15 #include "core/animation/Timing.h" 16 #include "core/animation/Timing.h"
16 #include "core/dom/Document.h" 17 #include "core/dom/Document.h"
17 #include <gtest/gtest.h> 18 #include <gtest/gtest.h>
18 #include <v8.h> 19 #include <v8.h>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 setV8ObjectPropertyAsString(keyframe1, "offset", "0"); 69 setV8ObjectPropertyAsString(keyframe1, "offset", "0");
69 setV8ObjectPropertyAsString(keyframe1, "easing", "ease-in-out"); 70 setV8ObjectPropertyAsString(keyframe1, "easing", "ease-in-out");
70 setV8ObjectPropertyAsString(keyframe2, "width", "0px"); 71 setV8ObjectPropertyAsString(keyframe2, "width", "0px");
71 setV8ObjectPropertyAsString(keyframe2, "offset", "1"); 72 setV8ObjectPropertyAsString(keyframe2, "offset", "1");
72 setV8ObjectPropertyAsString(keyframe2, "easing", "cubic-bezier(1, 1, 0.3, 0. 3)"); 73 setV8ObjectPropertyAsString(keyframe2, "easing", "cubic-bezier(1, 1, 0.3, 0. 3)");
73 74
74 jsKeyframes.append(Dictionary(keyframe1, m_isolate)); 75 jsKeyframes.append(Dictionary(keyframe1, m_isolate));
75 jsKeyframes.append(Dictionary(keyframe2, m_isolate)); 76 jsKeyframes.append(Dictionary(keyframe2, m_isolate));
76 77
77 String value1; 78 String value1;
78 ASSERT_TRUE(jsKeyframes[0].get("width", value1)); 79 ASSERT_TRUE(DictionaryHelper::get(jsKeyframes[0], "width", value1));
79 ASSERT_EQ("100px", value1); 80 ASSERT_EQ("100px", value1);
80 81
81 String value2; 82 String value2;
82 ASSERT_TRUE(jsKeyframes[1].get("width", value2)); 83 ASSERT_TRUE(DictionaryHelper::get(jsKeyframes[1], "width", value2));
83 ASSERT_EQ("0px", value2); 84 ASSERT_EQ("0px", value2);
84 85
85 RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsK eyframes, 0, exceptionState); 86 RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsK eyframes, 0, exceptionState);
86 87
87 Element* target = animation->target(); 88 Element* target = animation->target();
88 EXPECT_EQ(*element.get(), *target); 89 EXPECT_EQ(*element.get(), *target);
89 90
90 const KeyframeVector keyframes = toKeyframeEffectModelBase(animation->effect ())->getFrames(); 91 const KeyframeVector keyframes = toKeyframeEffectModelBase(animation->effect ())->getFrames();
91 92
92 EXPECT_EQ(0, keyframes[0]->offset()); 93 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()); 459 EXPECT_EQ(element.get(), animation->target());
459 document->timeline().play(animation.get()); 460 document->timeline().play(animation.get());
460 document.clear(); 461 document.clear();
461 element.clear(); 462 element.clear();
462 #if !ENABLE(OILPAN) 463 #if !ENABLE(OILPAN)
463 EXPECT_EQ(0, animation->target()); 464 EXPECT_EQ(0, animation->target());
464 #endif 465 #endif
465 } 466 }
466 467
467 } // namespace WebCore 468 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698