| OLD | NEW |
| 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 #include "core/testing/InternalDictionaryDerived.h" |
| 9 | 10 |
| 10 namespace blink { | 11 namespace blink { |
| 11 | 12 |
| 12 DictionaryTest::DictionaryTest() | 13 DictionaryTest::DictionaryTest() |
| 13 { | 14 { |
| 14 } | 15 } |
| 15 | 16 |
| 16 DictionaryTest::~DictionaryTest() | 17 DictionaryTest::~DictionaryTest() |
| 17 { | 18 { |
| 18 } | 19 } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 result.setEnumMemberWithDefault(m_enumMemberWithDefault); | 74 result.setEnumMemberWithDefault(m_enumMemberWithDefault); |
| 74 result.setEnumOrNullMember(m_enumOrNullMember); | 75 result.setEnumOrNullMember(m_enumOrNullMember); |
| 75 if (m_elementMember) | 76 if (m_elementMember) |
| 76 result.setElementMember(m_elementMember); | 77 result.setElementMember(m_elementMember); |
| 77 if (m_elementOrNullMember) | 78 if (m_elementOrNullMember) |
| 78 result.setElementOrNullMember(m_elementOrNullMember); | 79 result.setElementOrNullMember(m_elementOrNullMember); |
| 79 result.setObjectMember(m_objectMember); | 80 result.setObjectMember(m_objectMember); |
| 80 result.setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault); | 81 result.setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault); |
| 81 } | 82 } |
| 82 | 83 |
| 84 void DictionaryTest::setDerived(const InternalDictionaryDerived& derived) |
| 85 { |
| 86 set(derived); |
| 87 if (derived.hasDerivedStringMember()) |
| 88 m_derivedStringMember = derived.derivedStringMember(); |
| 89 m_derivedStringMemberWithDefault = derived.derivedStringMemberWithDefault(); |
| 90 } |
| 91 |
| 92 void DictionaryTest::getDerived(InternalDictionaryDerived& result) |
| 93 { |
| 94 get(result); |
| 95 result.setDerivedStringMember(m_derivedStringMember); |
| 96 result.setDerivedStringMemberWithDefault(m_derivedStringMemberWithDefault); |
| 97 } |
| 98 |
| 83 void DictionaryTest::reset() | 99 void DictionaryTest::reset() |
| 84 { | 100 { |
| 85 m_longMember = Nullable<int>(); | 101 m_longMember = Nullable<int>(); |
| 86 m_longMemberWithDefault = -1; // This value should not be returned. | 102 m_longMemberWithDefault = -1; // This value should not be returned. |
| 87 m_longOrNullMember = Nullable<int>(); | 103 m_longOrNullMember = Nullable<int>(); |
| 88 m_longOrNullMemberWithDefault = Nullable<int>(); | 104 m_longOrNullMemberWithDefault = Nullable<int>(); |
| 89 m_booleanMember = Nullable<bool>(); | 105 m_booleanMember = Nullable<bool>(); |
| 90 m_doubleMember = Nullable<double>(); | 106 m_doubleMember = Nullable<double>(); |
| 91 m_stringMember = String(); | 107 m_stringMember = String(); |
| 92 m_stringMemberWithDefault = String("Should not be returned"); | 108 m_stringMemberWithDefault = String("Should not be returned"); |
| 93 m_stringSequenceMember = Nullable<Vector<String> >(); | 109 m_stringSequenceMember = Nullable<Vector<String> >(); |
| 94 m_stringSequenceOrNullMember = Nullable<Vector<String> >(); | 110 m_stringSequenceOrNullMember = Nullable<Vector<String> >(); |
| 95 m_enumMember = String(); | 111 m_enumMember = String(); |
| 96 m_enumMemberWithDefault = String(); | 112 m_enumMemberWithDefault = String(); |
| 97 m_enumOrNullMember = String(); | 113 m_enumOrNullMember = String(); |
| 98 m_elementMember = nullptr; | 114 m_elementMember = nullptr; |
| 99 m_elementOrNullMember = nullptr; | 115 m_elementOrNullMember = nullptr; |
| 100 m_objectMember = ScriptValue(); | 116 m_objectMember = ScriptValue(); |
| 101 m_objectOrNullMemberWithDefault = ScriptValue(); | 117 m_objectOrNullMemberWithDefault = ScriptValue(); |
| 118 m_derivedStringMember = String(); |
| 119 m_derivedStringMemberWithDefault = String(); |
| 102 } | 120 } |
| 103 | 121 |
| 104 void DictionaryTest::trace(Visitor* visitor) | 122 void DictionaryTest::trace(Visitor* visitor) |
| 105 { | 123 { |
| 106 visitor->trace(m_elementMember); | 124 visitor->trace(m_elementMember); |
| 107 visitor->trace(m_elementOrNullMember); | 125 visitor->trace(m_elementOrNullMember); |
| 108 } | 126 } |
| 109 | 127 |
| 110 } | 128 } |
| OLD | NEW |