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

Side by Side Diff: Source/core/testing/DictionaryTest.cpp

Issue 590443002: IDL: object type support for IDL dictionary (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 2 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
« no previous file with comments | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionary.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "DictionaryTest.h" 6 #include "DictionaryTest.h"
7 7
8 #include "core/testing/InternalDictionary.h" 8 #include "core/testing/InternalDictionary.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 28 matching lines...) Expand all
39 m_stringSequenceMember = testingDictionary.stringSequenceMember(); 39 m_stringSequenceMember = testingDictionary.stringSequenceMember();
40 if (testingDictionary.hasStringSequenceOrNullMember()) 40 if (testingDictionary.hasStringSequenceOrNullMember())
41 m_stringSequenceOrNullMember = testingDictionary.stringSequenceOrNullMem ber(); 41 m_stringSequenceOrNullMember = testingDictionary.stringSequenceOrNullMem ber();
42 m_enumMember = testingDictionary.enumMember(); 42 m_enumMember = testingDictionary.enumMember();
43 m_enumMemberWithDefault = testingDictionary.enumMemberWithDefault(); 43 m_enumMemberWithDefault = testingDictionary.enumMemberWithDefault();
44 m_enumOrNullMember = testingDictionary.enumOrNullMember(); 44 m_enumOrNullMember = testingDictionary.enumOrNullMember();
45 if (testingDictionary.hasElementMember()) 45 if (testingDictionary.hasElementMember())
46 m_elementMember = testingDictionary.elementMember(); 46 m_elementMember = testingDictionary.elementMember();
47 if (testingDictionary.hasElementOrNullMember()) 47 if (testingDictionary.hasElementOrNullMember())
48 m_elementOrNullMember = testingDictionary.elementOrNullMember(); 48 m_elementOrNullMember = testingDictionary.elementOrNullMember();
49 m_objectMember = testingDictionary.objectMember();
50 m_objectOrNullMemberWithDefault = testingDictionary.objectOrNullMemberWithDe fault();
49 } 51 }
50 52
51 InternalDictionary* DictionaryTest::get() 53 InternalDictionary* DictionaryTest::get()
52 { 54 {
53 InternalDictionary* result = InternalDictionary::create(); 55 InternalDictionary* result = InternalDictionary::create();
54 if (m_longMember) 56 if (m_longMember)
55 result->setLongMember(m_longMember.get()); 57 result->setLongMember(m_longMember.get());
56 result->setLongMemberWithDefault(m_longMemberWithDefault); 58 result->setLongMemberWithDefault(m_longMemberWithDefault);
57 if (m_longOrNullMember) 59 if (m_longOrNullMember)
58 result->setLongOrNullMember(m_longOrNullMember.get()); 60 result->setLongOrNullMember(m_longOrNullMember.get());
59 if (m_longOrNullMemberWithDefault) 61 if (m_longOrNullMemberWithDefault)
60 result->setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get ()); 62 result->setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get ());
61 if (m_booleanMember) 63 if (m_booleanMember)
62 result->setBooleanMember(m_booleanMember.get()); 64 result->setBooleanMember(m_booleanMember.get());
63 if (m_doubleMember) 65 if (m_doubleMember)
64 result->setDoubleMember(m_doubleMember.get()); 66 result->setDoubleMember(m_doubleMember.get());
65 result->setStringMember(m_stringMember); 67 result->setStringMember(m_stringMember);
66 result->setStringMemberWithDefault(m_stringMemberWithDefault); 68 result->setStringMemberWithDefault(m_stringMemberWithDefault);
67 if (m_stringSequenceMember) 69 if (m_stringSequenceMember)
68 result->setStringSequenceMember(m_stringSequenceMember.get()); 70 result->setStringSequenceMember(m_stringSequenceMember.get());
69 if (m_stringSequenceOrNullMember) 71 if (m_stringSequenceOrNullMember)
70 result->setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get() ); 72 result->setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get() );
71 result->setEnumMember(m_enumMember); 73 result->setEnumMember(m_enumMember);
72 result->setEnumMemberWithDefault(m_enumMemberWithDefault); 74 result->setEnumMemberWithDefault(m_enumMemberWithDefault);
73 result->setEnumOrNullMember(m_enumOrNullMember); 75 result->setEnumOrNullMember(m_enumOrNullMember);
74 if (m_elementMember) 76 if (m_elementMember)
75 result->setElementMember(m_elementMember); 77 result->setElementMember(m_elementMember);
76 if (m_elementOrNullMember) 78 if (m_elementOrNullMember)
77 result->setElementOrNullMember(m_elementOrNullMember); 79 result->setElementOrNullMember(m_elementOrNullMember);
80 result->setObjectMember(m_objectMember);
81 result->setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault);
78 return result; 82 return result;
79 } 83 }
80 84
81 void DictionaryTest::reset() 85 void DictionaryTest::reset()
82 { 86 {
83 m_longMember = Nullable<int>(); 87 m_longMember = Nullable<int>();
84 m_longMemberWithDefault = -1; // This value should not be returned. 88 m_longMemberWithDefault = -1; // This value should not be returned.
85 m_longOrNullMember = Nullable<int>(); 89 m_longOrNullMember = Nullable<int>();
86 m_longOrNullMemberWithDefault = Nullable<int>(); 90 m_longOrNullMemberWithDefault = Nullable<int>();
87 m_booleanMember = Nullable<bool>(); 91 m_booleanMember = Nullable<bool>();
88 m_doubleMember = Nullable<double>(); 92 m_doubleMember = Nullable<double>();
89 m_stringMember = String(); 93 m_stringMember = String();
90 m_stringMemberWithDefault = String("Should not be returned"); 94 m_stringMemberWithDefault = String("Should not be returned");
91 m_stringSequenceMember = Nullable<Vector<String> >(); 95 m_stringSequenceMember = Nullable<Vector<String> >();
92 m_stringSequenceOrNullMember = Nullable<Vector<String> >(); 96 m_stringSequenceOrNullMember = Nullable<Vector<String> >();
93 m_enumMember = String(); 97 m_enumMember = String();
94 m_enumMemberWithDefault = String(); 98 m_enumMemberWithDefault = String();
95 m_enumOrNullMember = String(); 99 m_enumOrNullMember = String();
96 m_elementMember = nullptr; 100 m_elementMember = nullptr;
97 m_elementOrNullMember = nullptr; 101 m_elementOrNullMember = nullptr;
102 m_objectMember = ScriptValue();
103 m_objectOrNullMemberWithDefault = ScriptValue();
98 } 104 }
99 105
100 void DictionaryTest::trace(Visitor* visitor) 106 void DictionaryTest::trace(Visitor* visitor)
101 { 107 {
102 visitor->trace(m_elementMember); 108 visitor->trace(m_elementMember);
103 visitor->trace(m_elementOrNullMember); 109 visitor->trace(m_elementOrNullMember);
104 } 110 }
105 111
106 } 112 }
OLDNEW
« no previous file with comments | « Source/core/testing/DictionaryTest.h ('k') | Source/core/testing/InternalDictionary.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698