Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 423 } | 423 } |
| 424 | 424 |
| 425 Member(std::nullptr_t) : m_raw(0) | 425 Member(std::nullptr_t) : m_raw(0) |
| 426 { | 426 { |
| 427 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); | 427 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); |
| 428 } | 428 } |
| 429 | 429 |
| 430 Member(T* raw) : m_raw(raw) | 430 Member(T* raw) : m_raw(raw) |
| 431 { | 431 { |
| 432 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); | 432 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); |
| 433 ASSERT(!raw || ThreadStateFor<ThreadingTrait<T>::Affinity>::state()->con tains(raw)); | |
|
tkent
2014/03/19 04:46:50
This assertion is too strict.
A SQLTransaction obj
Mads Ager (chromium)
2014/03/19 06:30:54
Yes, that is true. I needed to relax the assert in
| |
| 434 } | 433 } |
| 435 | 434 |
| 436 Member(WTF::HashTableDeletedValueType) : m_raw(reinterpret_cast<T*>(-1)) | 435 Member(WTF::HashTableDeletedValueType) : m_raw(reinterpret_cast<T*>(-1)) |
| 437 { | 436 { |
| 438 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); | 437 COMPILE_ASSERT_IS_GARBAGE_COLLECTED(T, NonGarbageCollectedObjectInMember ); |
| 439 } | 438 } |
| 440 | 439 |
| 441 bool isHashTableDeletedValue() const { return m_raw == reinterpret_cast<T*>( -1); } | 440 bool isHashTableDeletedValue() const { return m_raw == reinterpret_cast<T*>( -1); } |
| 442 | 441 |
| 443 template<typename U> | 442 template<typename U> |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 930 }; | 929 }; |
| 931 | 930 |
| 932 template<typename T, typename U> | 931 template<typename T, typename U> |
| 933 struct NeedsTracing<HashMap<T, U> > { | 932 struct NeedsTracing<HashMap<T, U> > { |
| 934 static const bool value = false; | 933 static const bool value = false; |
| 935 }; | 934 }; |
| 936 | 935 |
| 937 } // namespace WTF | 936 } // namespace WTF |
| 938 | 937 |
| 939 #endif | 938 #endif |
| OLD | NEW |