Title: [292581] releases/WebKitGTK/webkit-2.34/Source/WebCore
Revision
292581
Author
ape...@igalia.com
Date
2022-04-07 17:08:16 -0700 (Thu, 07 Apr 2022)

Log Message

Merge r287147 - Rename forEachFrameFromMainFrame to forEachFrame
https://bugs.webkit.org/show_bug.cgi?id=234396
<rdar://problem/86581926>

Reviewed by Geoffrey Garen.

Follow-up to r287110: Switch method naming to match 'forEachDocument'.

* page/Page.cpp:
(WebCore::Page::~Page):
(WebCore::Page::notifyToInjectUserScripts):
(WebCore::Page::forEachFrame):
(WebCore::Page::forEachFrameFromMainFrame): Deleted.
* page/Page.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (292580 => 292581)


--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog	2022-04-08 00:08:11 UTC (rev 292580)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog	2022-04-08 00:08:16 UTC (rev 292581)
@@ -1,3 +1,20 @@
+2021-12-16  Brent Fulgham  <bfulg...@apple.com>
+
+        Rename forEachFrameFromMainFrame to forEachFrame
+        https://bugs.webkit.org/show_bug.cgi?id=234396
+        <rdar://problem/86581926>
+
+        Reviewed by Geoffrey Garen.
+
+        Follow-up to r287110: Switch method naming to match 'forEachDocument'.
+
+        * page/Page.cpp:
+        (WebCore::Page::~Page):
+        (WebCore::Page::notifyToInjectUserScripts):
+        (WebCore::Page::forEachFrame):
+        (WebCore::Page::forEachFrameFromMainFrame): Deleted.
+        * page/Page.h:
+
 2022-03-24  Kimmo Kinnunen  <kkinnu...@apple.com>
 
         REGRESSION (r287807): WEBGL_multi_draw validation rejecting valid arguments

Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.cpp (292580 => 292581)


--- releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.cpp	2022-04-08 00:08:11 UTC (rev 292580)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.cpp	2022-04-08 00:08:16 UTC (rev 292581)
@@ -393,7 +393,7 @@
 
     m_inspectorController->inspectedPageDestroyed();
 
-    forEachFrameFromMainFrame([] (Frame& frame) {
+    forEachFrame([] (Frame& frame) {
         frame.willDetachPage();
         frame.detachFromPage();
     });
@@ -2924,7 +2924,7 @@
 {
     m_hasBeenNotifiedToInjectUserScripts = true;
 
-    forEachFrameFromMainFrame([] (Frame& frame) {
+    forEachFrame([] (Frame& frame) {
         frame.injectUserScriptsAwaitingNotification();
     });
 }
@@ -3365,7 +3365,7 @@
 #endif
 }
 
-void Page::forEachFrameFromMainFrame(const Function<void(Frame&)>& functor)
+void Page::forEachFrame(const Function<void(Frame&)>& functor)
 {
     Vector<Ref<Frame>> frames;
     for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())

Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.h (292580 => 292581)


--- releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.h	2022-04-08 00:08:11 UTC (rev 292580)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/page/Page.h	2022-04-08 00:08:16 UTC (rev 292581)
@@ -850,7 +850,7 @@
     WEBCORE_EXPORT void forEachDocument(const Function<void(Document&)>&) const;
     void forEachMediaElement(const Function<void(HTMLMediaElement&)>&);
     static void forEachDocumentFromMainFrame(const Frame&, const Function<void(Document&)>&);
-    void forEachFrameFromMainFrame(const Function<void(Frame&)>&);
+    void forEachFrame(const Function<void(Frame&)>&);
 
     bool shouldDisableCorsForRequestTo(const URL&) const;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to