| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 continue; | 63 continue; |
| 64 | 64 |
| 65 bool skip = false; | 65 bool skip = false; |
| 66 for (size_t j = 0; j < result.size(); j++) { | 66 for (size_t j = 0; j < result.size(); j++) { |
| 67 if (array[i]->isEqual(result[j].get())) { | 67 if (array[i]->isEqual(result[j].get())) { |
| 68 skip = true; | 68 skip = true; |
| 69 break; | 69 break; |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 if (!skip) { | 72 if (!skip) { |
| 73 result.append(array[i]); | 73 result.push_back(array[i]); |
| 74 } | 74 } |
| 75 } | 75 } |
| 76 IDBKey* idbKey = new IDBKey(result); | 76 IDBKey* idbKey = new IDBKey(result); |
| 77 ASSERT(idbKey->isValid()); | 77 ASSERT(idbKey->isValid()); |
| 78 return idbKey; | 78 return idbKey; |
| 79 } | 79 } |
| 80 | 80 |
| 81 static IDBKey* createArray(const KeyArray& array) { | 81 static IDBKey* createArray(const KeyArray& array) { |
| 82 return new IDBKey(array); | 82 return new IDBKey(array); |
| 83 } | 83 } |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 const Type m_type; | 140 const Type m_type; |
| 141 const KeyArray m_array; | 141 const KeyArray m_array; |
| 142 RefPtr<SharedBuffer> m_binary; | 142 RefPtr<SharedBuffer> m_binary; |
| 143 const String m_string; | 143 const String m_string; |
| 144 const double m_number = 0; | 144 const double m_number = 0; |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 } // namespace blink | 147 } // namespace blink |
| 148 | 148 |
| 149 #endif // IDBKey_h | 149 #endif // IDBKey_h |
| OLD | NEW |