| 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 | 9 |
| 10 namespace blink { | 10 namespace blink { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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(); | 49 m_objectMember = testingDictionary.objectMember(); |
| 50 m_objectOrNullMemberWithDefault = testingDictionary.objectOrNullMemberWithDe
fault(); | 50 m_objectOrNullMemberWithDefault = testingDictionary.objectOrNullMemberWithDe
fault(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 InternalDictionary* DictionaryTest::get() | 53 void DictionaryTest::get(InternalDictionary& result) |
| 54 { | 54 { |
| 55 InternalDictionary* result = InternalDictionary::create(); | |
| 56 if (m_longMember) | 55 if (m_longMember) |
| 57 result->setLongMember(m_longMember.get()); | 56 result.setLongMember(m_longMember.get()); |
| 58 result->setLongMemberWithDefault(m_longMemberWithDefault); | 57 result.setLongMemberWithDefault(m_longMemberWithDefault); |
| 59 if (m_longOrNullMember) | 58 if (m_longOrNullMember) |
| 60 result->setLongOrNullMember(m_longOrNullMember.get()); | 59 result.setLongOrNullMember(m_longOrNullMember.get()); |
| 61 if (m_longOrNullMemberWithDefault) | 60 if (m_longOrNullMemberWithDefault) |
| 62 result->setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get
()); | 61 result.setLongOrNullMemberWithDefault(m_longOrNullMemberWithDefault.get(
)); |
| 63 if (m_booleanMember) | 62 if (m_booleanMember) |
| 64 result->setBooleanMember(m_booleanMember.get()); | 63 result.setBooleanMember(m_booleanMember.get()); |
| 65 if (m_doubleMember) | 64 if (m_doubleMember) |
| 66 result->setDoubleMember(m_doubleMember.get()); | 65 result.setDoubleMember(m_doubleMember.get()); |
| 67 result->setStringMember(m_stringMember); | 66 result.setStringMember(m_stringMember); |
| 68 result->setStringMemberWithDefault(m_stringMemberWithDefault); | 67 result.setStringMemberWithDefault(m_stringMemberWithDefault); |
| 69 if (m_stringSequenceMember) | 68 if (m_stringSequenceMember) |
| 70 result->setStringSequenceMember(m_stringSequenceMember.get()); | 69 result.setStringSequenceMember(m_stringSequenceMember.get()); |
| 71 if (m_stringSequenceOrNullMember) | 70 if (m_stringSequenceOrNullMember) |
| 72 result->setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get()
); | 71 result.setStringSequenceOrNullMember(m_stringSequenceOrNullMember.get())
; |
| 73 result->setEnumMember(m_enumMember); | 72 result.setEnumMember(m_enumMember); |
| 74 result->setEnumMemberWithDefault(m_enumMemberWithDefault); | 73 result.setEnumMemberWithDefault(m_enumMemberWithDefault); |
| 75 result->setEnumOrNullMember(m_enumOrNullMember); | 74 result.setEnumOrNullMember(m_enumOrNullMember); |
| 76 if (m_elementMember) | 75 if (m_elementMember) |
| 77 result->setElementMember(m_elementMember); | 76 result.setElementMember(m_elementMember); |
| 78 if (m_elementOrNullMember) | 77 if (m_elementOrNullMember) |
| 79 result->setElementOrNullMember(m_elementOrNullMember); | 78 result.setElementOrNullMember(m_elementOrNullMember); |
| 80 result->setObjectMember(m_objectMember); | 79 result.setObjectMember(m_objectMember); |
| 81 result->setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault); | 80 result.setObjectOrNullMemberWithDefault(m_objectOrNullMemberWithDefault); |
| 82 return result; | |
| 83 } | 81 } |
| 84 | 82 |
| 85 void DictionaryTest::reset() | 83 void DictionaryTest::reset() |
| 86 { | 84 { |
| 87 m_longMember = Nullable<int>(); | 85 m_longMember = Nullable<int>(); |
| 88 m_longMemberWithDefault = -1; // This value should not be returned. | 86 m_longMemberWithDefault = -1; // This value should not be returned. |
| 89 m_longOrNullMember = Nullable<int>(); | 87 m_longOrNullMember = Nullable<int>(); |
| 90 m_longOrNullMemberWithDefault = Nullable<int>(); | 88 m_longOrNullMemberWithDefault = Nullable<int>(); |
| 91 m_booleanMember = Nullable<bool>(); | 89 m_booleanMember = Nullable<bool>(); |
| 92 m_doubleMember = Nullable<double>(); | 90 m_doubleMember = Nullable<double>(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 103 m_objectOrNullMemberWithDefault = ScriptValue(); | 101 m_objectOrNullMemberWithDefault = ScriptValue(); |
| 104 } | 102 } |
| 105 | 103 |
| 106 void DictionaryTest::trace(Visitor* visitor) | 104 void DictionaryTest::trace(Visitor* visitor) |
| 107 { | 105 { |
| 108 visitor->trace(m_elementMember); | 106 visitor->trace(m_elementMember); |
| 109 visitor->trace(m_elementOrNullMember); | 107 visitor->trace(m_elementOrNullMember); |
| 110 } | 108 } |
| 111 | 109 |
| 112 } | 110 } |
| OLD | NEW |