| 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 24 matching lines...) Expand all Loading... |
| 35 #include "platform/heap/HeapAllocator.h" | 35 #include "platform/heap/HeapAllocator.h" |
| 36 #include "platform/heap/InlinedGlobalMarkingVisitor.h" | 36 #include "platform/heap/InlinedGlobalMarkingVisitor.h" |
| 37 #include "platform/heap/PersistentNode.h" | 37 #include "platform/heap/PersistentNode.h" |
| 38 #include "platform/heap/ThreadState.h" | 38 #include "platform/heap/ThreadState.h" |
| 39 #include "platform/heap/TraceTraits.h" | 39 #include "platform/heap/TraceTraits.h" |
| 40 #include "platform/heap/Visitor.h" | 40 #include "platform/heap/Visitor.h" |
| 41 #include "wtf/Allocator.h" | 41 #include "wtf/Allocator.h" |
| 42 #include "wtf/Atomics.h" | 42 #include "wtf/Atomics.h" |
| 43 #include "wtf/Functional.h" | 43 #include "wtf/Functional.h" |
| 44 #include "wtf/HashFunctions.h" | 44 #include "wtf/HashFunctions.h" |
| 45 #include "wtf/Locker.h" | |
| 46 #include "wtf/TypeTraits.h" | 45 #include "wtf/TypeTraits.h" |
| 47 | 46 |
| 48 #if defined(LEAK_SANITIZER) | 47 #if defined(LEAK_SANITIZER) |
| 49 #include "wtf/LeakAnnotations.h" | 48 #include "wtf/LeakAnnotations.h" |
| 50 #endif | 49 #endif |
| 51 | 50 |
| 52 namespace blink { | 51 namespace blink { |
| 53 | 52 |
| 54 // Marker used to annotate persistent objects and collections with, | 53 // Marker used to annotate persistent objects and collections with, |
| 55 // so as to enable reliable testing for persistent references via | 54 // so as to enable reliable testing for persistent references via |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1214 // into it. | 1213 // into it. |
| 1215 // | 1214 // |
| 1216 // TODO(sof): remove this hack once wtf/Functional.h can also work with a ty
pe like | 1215 // TODO(sof): remove this hack once wtf/Functional.h can also work with a ty
pe like |
| 1217 // CrossThreadWeakPersistent<>. | 1216 // CrossThreadWeakPersistent<>. |
| 1218 static WeakPtr<T> unwrap(const StorageType& value) { return WeakPtr<T>(WeakR
eference<T>::create(value.get())); } | 1217 static WeakPtr<T> unwrap(const StorageType& value) { return WeakPtr<T>(WeakR
eference<T>::create(value.get())); } |
| 1219 }; | 1218 }; |
| 1220 | 1219 |
| 1221 } // namespace WTF | 1220 } // namespace WTF |
| 1222 | 1221 |
| 1223 #endif | 1222 #endif |
| OLD | NEW |