Add more smart pointers to lazy load observers

https://bugs.webkit.org/show_bug.cgi?id=273321 Reviewed by Chris Dumez. Add more smart pointers to lazy load observers, by both replacing raw member variables and fixing [alpha.webkit.UncountedCallArgsChecker] warnings. * Source/WebCore/html/LazyLoadFrameObserver.cpp: (WebCore::LazyLoadFrameObserver::observe): (WebCore::LazyLoadFrameObserver::unobserve): * Source/WebCore/html/LazyLoadFrameObserver.h: * Source/WebCore/html/LazyLoadImageObserver.cpp: (WebCore::LazyLoadImageObserver::observe): Canonical link: https://commits.webkit.org/278368@main
WebKit · May 4, 2024 · 2b3f00e · 2b3f00e
1 parent 1cf2718
commit 2b3f00e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/WebCore/html/LazyLoadFrameObserver.cpp b/Source/WebCore/html/LazyLoadFrameObserver.cpp
@@ -74,8 +74,8 @@ LazyLoadFrameObserver::LazyLoadFrameObserver(HTMLIFrameElement& element)
 
 void LazyLoadFrameObserver::observe(const AtomString& frameURL, const ReferrerPolicy& referrerPolicy)
 {
-    auto& frameObserver = m_element.lazyLoadFrameObserver();
-    auto* intersectionObserver = frameObserver.intersectionObserver(m_element.document());
+    auto& frameObserver = m_element->lazyLoadFrameObserver();
+    auto* intersectionObserver = frameObserver.intersectionObserver(m_element->protectedDocument());
     if (!intersectionObserver)
         return;
     m_frameURL = frameURL;
@@ -85,7 +85,7 @@ void LazyLoadFrameObserver::observe(const AtomString& frameURL, const ReferrerPo
 
 void LazyLoadFrameObserver::unobserve()
 {
-    auto& frameObserver = m_element.lazyLoadFrameObserver();
+    auto& frameObserver = m_element->lazyLoadFrameObserver();
     ASSERT(frameObserver.isObserved(m_element));
     frameObserver.m_observer->unobserve(m_element);
 }

diff --git a/Source/WebCore/html/LazyLoadFrameObserver.h b/Source/WebCore/html/LazyLoadFrameObserver.h
@@ -48,7 +48,7 @@ class LazyLoadFrameObserver {
     IntersectionObserver* intersectionObserver(Document&);
     bool isObserved(Element&) const;
 
-    HTMLIFrameElement& m_element;
+    WeakRef<HTMLIFrameElement, WeakPtrImplWithEventTargetData> m_element;
     AtomString m_frameURL;
     ReferrerPolicy m_referrerPolicy;
     RefPtr<IntersectionObserver> m_observer;

diff --git a/Source/WebCore/html/LazyLoadImageObserver.cpp b/Source/WebCore/html/LazyLoadImageObserver.cpp
@@ -68,7 +68,7 @@ class LazyImageLoadIntersectionObserverCallback final : public IntersectionObser
 void LazyLoadImageObserver::observe(Element& element)
 {
     auto& observer = element.document().lazyLoadImageObserver();
-    auto* intersectionObserver = observer.intersectionObserver(element.document());
+    auto* intersectionObserver = observer.intersectionObserver(element.protectedDocument());
     if (!intersectionObserver)
         return;
     intersectionObserver->observe(element);