| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "core/dom/NodeIntersectionObserverData.h" | 5 #include "core/dom/NodeIntersectionObserverData.h" |
| 6 | 6 |
| 7 #include "core/dom/Document.h" | 7 #include "core/dom/Document.h" |
| 8 #include "core/dom/IntersectionObservation.h" | 8 #include "core/dom/IntersectionObservation.h" |
| 9 #include "core/dom/IntersectionObserver.h" | 9 #include "core/dom/IntersectionObserver.h" |
| 10 #include "core/dom/IntersectionObserverController.h" | 10 #include "core/dom/IntersectionObserverController.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 void NodeIntersectionObserverData::dispose() | 49 void NodeIntersectionObserverData::dispose() |
| 50 { | 50 { |
| 51 HeapVector<Member<IntersectionObserver>> observersToDisconnect; | 51 HeapVector<Member<IntersectionObserver>> observersToDisconnect; |
| 52 copyToVector(m_intersectionObservers, observersToDisconnect); | 52 copyToVector(m_intersectionObservers, observersToDisconnect); |
| 53 for (auto& observer : observersToDisconnect) | 53 for (auto& observer : observersToDisconnect) |
| 54 observer->disconnect(); | 54 observer->disconnect(); |
| 55 ASSERT(m_intersectionObservers.isEmpty()); | 55 ASSERT(m_intersectionObservers.isEmpty()); |
| 56 } | 56 } |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 WeakPtrWillBeRawPtr<Node> NodeIntersectionObserverData::createWeakPtr(Node* node
) | 59 RawPtr<Node> NodeIntersectionObserverData::createWeakPtr(Node* node) |
| 60 { | 60 { |
| 61 #if ENABLE(OILPAN) | 61 #if ENABLE(OILPAN) |
| 62 return node; | 62 return node; |
| 63 #else | 63 #else |
| 64 if (!m_weakPointerFactory) | 64 if (!m_weakPointerFactory) |
| 65 m_weakPointerFactory = adoptPtrWillBeNoop(new WeakPtrFactory<Node>(node)
); | 65 m_weakPointerFactory = new WeakPtrFactory<Node>(node); |
| 66 WeakPtr<Node> result = m_weakPointerFactory->createWeakPtr(); | 66 WeakPtr<Node> result = m_weakPointerFactory->createWeakPtr(); |
| 67 ASSERT(result.get() == node); | 67 ASSERT(result.get() == node); |
| 68 return result; | 68 return result; |
| 69 #endif | 69 #endif |
| 70 } | 70 } |
| 71 | 71 |
| 72 DEFINE_TRACE(NodeIntersectionObserverData) | 72 DEFINE_TRACE(NodeIntersectionObserverData) |
| 73 { | 73 { |
| 74 visitor->trace(m_intersectionObservers); | 74 visitor->trace(m_intersectionObservers); |
| 75 visitor->trace(m_intersectionObservations); | 75 visitor->trace(m_intersectionObservations); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace blink | 78 } // namespace blink |
| OLD | NEW |