Title: [279783] trunk/Source/WebCore
Revision
279783
Author
n...@apple.com
Date
2021-07-09 08:11:43 -0700 (Fri, 09 Jul 2021)

Log Message

Make topLayerElements() use Ref instead of RefPtr
https://bugs.webkit.org/show_bug.cgi?id=227839

Reviewed by Youenn Fablet.

* dom/Document.cpp:
(WebCore::Document::addToTopLayer):
(WebCore::Document::removeFromTopLayer):
(WebCore::Document::activeModalDialog const):
* dom/Document.h:
(WebCore::Document::topLayerElements const):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (279782 => 279783)


--- trunk/Source/WebCore/ChangeLog	2021-07-09 13:29:06 UTC (rev 279782)
+++ trunk/Source/WebCore/ChangeLog	2021-07-09 15:11:43 UTC (rev 279783)
@@ -1,3 +1,17 @@
+2021-07-09  Tim Nguyen  <n...@apple.com>
+
+        Make topLayerElements() use Ref instead of RefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=227839
+
+        Reviewed by Youenn Fablet.
+
+        * dom/Document.cpp:
+        (WebCore::Document::addToTopLayer):
+        (WebCore::Document::removeFromTopLayer):
+        (WebCore::Document::activeModalDialog const):
+        * dom/Document.h:
+        (WebCore::Document::topLayerElements const):
+
 2021-07-09  Alexander Mikhaylenko  <al...@gnome.org>
 
         [GTK] Support dark scrollbars

Modified: trunk/Source/WebCore/dom/Document.cpp (279782 => 279783)


--- trunk/Source/WebCore/dom/Document.cpp	2021-07-09 13:29:06 UTC (rev 279782)
+++ trunk/Source/WebCore/dom/Document.cpp	2021-07-09 15:11:43 UTC (rev 279783)
@@ -8403,7 +8403,7 @@
 void Document::addToTopLayer(Element& element)
 {
     // To add an element to a top layer, remove it from top layer and then append it to top layer.
-    m_topLayerElements.appendOrMoveToLast(&element);
+    m_topLayerElements.appendOrMoveToLast(element);
 
     element.invalidateStyle();
 }
@@ -8410,7 +8410,7 @@
 
 void Document::removeFromTopLayer(Element& element)
 {
-    if (!m_topLayerElements.remove(&element))
+    if (!m_topLayerElements.remove(element))
         return;
 
     element.invalidateStyle();
@@ -8420,7 +8420,7 @@
 {
     for (auto& element : makeReversedRange(m_topLayerElements)) {
         if (is<HTMLDialogElement>(element))
-            return downcast<HTMLDialogElement>(element.get());
+            return downcast<HTMLDialogElement>(element.ptr());
     }
 
     return nullptr;

Modified: trunk/Source/WebCore/dom/Document.h (279782 => 279783)


--- trunk/Source/WebCore/dom/Document.h	2021-07-09 13:29:06 UTC (rev 279782)
+++ trunk/Source/WebCore/dom/Document.h	2021-07-09 15:11:43 UTC (rev 279783)
@@ -1504,7 +1504,7 @@
 
     void addToTopLayer(Element&);
     void removeFromTopLayer(Element&);
-    const ListHashSet<RefPtr<Element>>& topLayerElements() const { return m_topLayerElements; }
+    const ListHashSet<Ref<Element>>& topLayerElements() const { return m_topLayerElements; }
 
     HTMLDialogElement* activeModalDialog() const;
 
@@ -2195,7 +2195,7 @@
     UniqueRef<Editor> m_editor;
     UniqueRef<FrameSelection> m_selection;
 
-    ListHashSet<RefPtr<Element>> m_topLayerElements;
+    ListHashSet<Ref<Element>> m_topLayerElements;
 };
 
 Element* eventTargetElementForDocument(Document*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to