third_party/WebKit/Source/core/dom/IntersectionObservation.cpp - Issue 1603773002: Use registerWeakMembers to manage observer root.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

Issue 1603773002: Use registerWeakMembers to manage observer root. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: nit scratched Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

diff --git a/third_party/WebKit/Source/core/dom/IntersectionObservation.cpp b/third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

index 1f06da2f7f20b48a858b902738a2a7bf00991ed3..a32edd7be70bcdf562207bb7a3100af44988a3d6 100644

--- a/third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

+++ b/third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

@@ -161,9 +161,15 @@ void IntersectionObservation::computeIntersectionObservations(double timestamp)

void IntersectionObservation::disconnect()

{

+ IntersectionObserver* observer = m_observer;

+ clearRootAndRemoveFromTarget();

+ observer->removeObservation(*this);

+void IntersectionObservation::clearRootAndRemoveFromTarget()

if (m_target)

- target()->ensureIntersectionObserverData().removeObservation(this->observer());

- m_observer->removeObservation(*this);

+ target()->ensureIntersectionObserverData().removeObservation(observer());

m_observer.clear();

}