| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 return pointer; // This is in fact a move. | 153 return pointer; // This is in fact a move. |
| 154 } | 154 } |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 template<typename T> | 157 template<typename T> |
| 158 struct CrossThreadCopier<CrossThreadPersistent<T>> : public CrossThreadCopierPas
sThrough<CrossThreadPersistent<T>> { | 158 struct CrossThreadCopier<CrossThreadPersistent<T>> : public CrossThreadCopierPas
sThrough<CrossThreadPersistent<T>> { |
| 159 STATIC_ONLY(CrossThreadCopier); | 159 STATIC_ONLY(CrossThreadCopier); |
| 160 }; | 160 }; |
| 161 | 161 |
| 162 template<typename T> | 162 template<typename T> |
| 163 struct CrossThreadCopier<CrossThreadWeakPersistent<T>> : public CrossThreadCopie
rPassThrough<CrossThreadWeakPersistent<T>> { |
| 164 STATIC_ONLY(CrossThreadCopier); |
| 165 }; |
| 166 |
| 167 template<typename T> |
| 163 struct CrossThreadCopier<WeakPtr<T>> : public CrossThreadCopierPassThrough<WeakP
tr<T>> { | 168 struct CrossThreadCopier<WeakPtr<T>> : public CrossThreadCopierPassThrough<WeakP
tr<T>> { |
| 164 STATIC_ONLY(CrossThreadCopier); | 169 STATIC_ONLY(CrossThreadCopier); |
| 165 }; | 170 }; |
| 166 | 171 |
| 167 template <typename T> | 172 template <typename T> |
| 168 struct CrossThreadCopier<WTF::PassedWrapper<T>> { | 173 struct CrossThreadCopier<WTF::PassedWrapper<T>> { |
| 169 STATIC_ONLY(CrossThreadCopier); | 174 STATIC_ONLY(CrossThreadCopier); |
| 170 using Type = WTF::PassedWrapper<typename CrossThreadCopier<T>::Type>; | 175 using Type = WTF::PassedWrapper<typename CrossThreadCopier<T>::Type>; |
| 171 static Type copy(WTF::PassedWrapper<T>&& value) { return passed(CrossThreadC
opier<T>::copy(value.moveOut())); } | 176 static Type copy(WTF::PassedWrapper<T>&& value) { return passed(CrossThreadC
opier<T>::copy(value.moveOut())); } |
| 172 }; | 177 }; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 AllowCrossThreadAccessWrapper<T*> AllowCrossThreadAccess(T* value) | 259 AllowCrossThreadAccessWrapper<T*> AllowCrossThreadAccess(T* value) |
| 255 { | 260 { |
| 256 static_assert(!IsGarbageCollectedType<T>::value, "Use wrapCrossThreadPersist
ent() instead for garbage-collected pointers"); | 261 static_assert(!IsGarbageCollectedType<T>::value, "Use wrapCrossThreadPersist
ent() instead for garbage-collected pointers"); |
| 257 static_assert(!WTF::IsSubclassOfTemplate<T, ThreadSafeRefCounted>::value, "U
se PassRefPtr<T> instead for ThreadSafeRefCounted"); | 262 static_assert(!WTF::IsSubclassOfTemplate<T, ThreadSafeRefCounted>::value, "U
se PassRefPtr<T> instead for ThreadSafeRefCounted"); |
| 258 return AllowCrossThreadAccessWrapper<T*>(value); | 263 return AllowCrossThreadAccessWrapper<T*>(value); |
| 259 } | 264 } |
| 260 | 265 |
| 261 } // namespace blink | 266 } // namespace blink |
| 262 | 267 |
| 263 #endif // CrossThreadCopier_h | 268 #endif // CrossThreadCopier_h |
| OLD | NEW |