- Revision
- 287110
- Author
- bfulg...@apple.com
- Date
- 2021-12-15 15:19:57 -0800 (Wed, 15 Dec 2021)
Log Message
Clean-up: Adopt Page::forEachDocument in some missed spots
https://bugs.webkit.org/show_bug.cgi?id=234324
<rdar://problem/85443831>
Reviewed by Darin Adler.
Switch manual loops to our 'forEachDocument' style in a few places that were missed
in earlier refactoring.
No change in behavior.
* history/BackForwardCache.cpp:
(WebCore::setBackForwardCacheState)
* page/EventHandler.cpp:
(WebCore::removeDraggedContentDocumentMarkersFromAllFramesInPage):
* page/Frame.cpp:
(WebCore::Frame::orientationChanged):
* page/Page.cpp:
(WebCore::Page::~Page):
(WebCore::Page::forEachDocumentFromMainFrame): Added.
(WebCore::Page::forEachDocument): Use new method.
(WebCore::Page::forEachFrameFromMainFrame): Added.
(WebCore::Page::windowScreenDidChange):
(WebCore::Page::userAgentChanged):
* page/ios/FrameIOS.mm:
(WebCore::Frame::dispatchPageHideEventBeforePause):
(WebCore::Frame::dispatchPageShowEventBeforeResume):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (287109 => 287110)
--- trunk/Source/WebCore/ChangeLog 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/ChangeLog 2021-12-15 23:19:57 UTC (rev 287110)
@@ -1,3 +1,33 @@
+2021-12-15 Brent Fulgham <bfulg...@apple.com>
+
+ Clean-up: Adopt Page::forEachDocument in some missed spots
+ https://bugs.webkit.org/show_bug.cgi?id=234324
+ <rdar://problem/85443831>
+
+ Reviewed by Darin Adler.
+
+ Switch manual loops to our 'forEachDocument' style in a few places that were missed
+ in earlier refactoring.
+
+ No change in behavior.
+
+ * history/BackForwardCache.cpp:
+ (WebCore::setBackForwardCacheState)
+ * page/EventHandler.cpp:
+ (WebCore::removeDraggedContentDocumentMarkersFromAllFramesInPage):
+ * page/Frame.cpp:
+ (WebCore::Frame::orientationChanged):
+ * page/Page.cpp:
+ (WebCore::Page::~Page):
+ (WebCore::Page::forEachDocumentFromMainFrame): Added.
+ (WebCore::Page::forEachDocument): Use new method.
+ (WebCore::Page::forEachFrameFromMainFrame): Added.
+ (WebCore::Page::windowScreenDidChange):
+ (WebCore::Page::userAgentChanged):
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::dispatchPageHideEventBeforePause):
+ (WebCore::Frame::dispatchPageShowEventBeforeResume):
+
2021-12-15 Alex Christensen <achristen...@webkit.org>
Fix Linux and windows build
Modified: trunk/Source/WebCore/history/BackForwardCache.cpp (287109 => 287110)
--- trunk/Source/WebCore/history/BackForwardCache.cpp 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/history/BackForwardCache.cpp 2021-12-15 23:19:57 UTC (rev 287110)
@@ -388,10 +388,9 @@
static void setBackForwardCacheState(Page& page, Document::BackForwardCacheState BackForwardCacheState)
{
- for (Frame* frame = &page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (auto* document = frame->document())
- document->setBackForwardCacheState(BackForwardCacheState);
- }
+ page.forEachDocument([&] (Document& document) {
+ document.setBackForwardCacheState(BackForwardCacheState);
+ });
}
// When entering back/forward cache, tear down the render tree before setting the in-cache flag.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (287109 => 287110)
--- trunk/Source/WebCore/page/EventHandler.cpp 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2021-12-15 23:19:57 UTC (rev 287110)
@@ -3925,10 +3925,9 @@
static void removeDraggedContentDocumentMarkersFromAllFramesInPage(Page& page)
{
- for (RefPtr frame = &page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (RefPtr document = frame->document())
- document->markers().removeMarkers(DocumentMarker::DraggedContent);
- }
+ page.forEachDocument([] (Document& document) {
+ document.markers().removeMarkers(DocumentMarker::DraggedContent);
+ });
if (auto* mainFrameRenderer = page.mainFrame().contentRenderer())
mainFrameRenderer->repaintRootContents();
Modified: trunk/Source/WebCore/page/Frame.cpp (287109 => 287110)
--- trunk/Source/WebCore/page/Frame.cpp 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/page/Frame.cpp 2021-12-15 23:19:57 UTC (rev 287110)
@@ -362,15 +362,9 @@
#if ENABLE(ORIENTATION_EVENTS)
void Frame::orientationChanged()
{
- Vector<Ref<Frame>> frames;
- for (Frame* frame = this; frame; frame = frame->tree().traverseNext())
- frames.append(*frame);
-
- auto newOrientation = orientation();
- for (auto& frame : frames) {
- if (Document* document = frame->document())
- document->orientationChanged(newOrientation);
- }
+ Page::forEachDocumentFromMainFrame(*this, [newOrientation = orientation()] (Document& document) {
+ document.orientationChanged(newOrientation);
+ });
}
int Frame::orientation() const
Modified: trunk/Source/WebCore/page/Page.cpp (287109 => 287110)
--- trunk/Source/WebCore/page/Page.cpp 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/page/Page.cpp 2021-12-15 23:19:57 UTC (rev 287110)
@@ -407,10 +407,10 @@
m_inspectorController->inspectedPageDestroyed();
- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- frame->willDetachPage();
- frame->detachFromPage();
- }
+ forEachFrameFromMainFrame([] (Frame& frame) {
+ frame.willDetachPage();
+ frame.detachFromPage();
+ });
if (m_scrollingCoordinator)
m_scrollingCoordinator->pageDestroyed();
@@ -1243,10 +1243,9 @@
m_displayNominalFramesPerSecond = DisplayRefreshMonitorManager::sharedManager().nominalFramesPerSecondForDisplay(m_displayID, chrome().client().displayRefreshMonitorFactory());
}
- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->document())
- frame->document()->windowScreenDidChange(displayID);
- }
+ forEachDocument([&] (Document& document) {
+ document.windowScreenDidChange(displayID);
+ });
#if ENABLE(VIDEO)
auto mode = preferredDynamicRangeMode(mainFrame().view());
@@ -1984,13 +1983,12 @@
void Page::userAgentChanged()
{
- for (auto* frame = &m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
- auto* window = frame->window();
- if (!window)
- continue;
- if (auto* navigator = window->optionalNavigator())
- navigator->userAgentChanged();
- }
+ forEachDocument([] (Document& document) {
+ if (auto* window = document.domWindow()) {
+ if (auto* navigator = window->optionalNavigator())
+ navigator->userAgentChanged();
+ }
+ });
}
void Page::invalidateStylesForAllLinks()
@@ -2993,8 +2991,9 @@
{
m_hasBeenNotifiedToInjectUserScripts = true;
- for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
- frame->injectUserScriptsAwaitingNotification();
+ forEachFrameFromMainFrame([] (Frame& frame) {
+ frame.injectUserScriptsAwaitingNotification();
+ });
}
void Page::setUserContentProvider(Ref<UserContentProvider>&& userContentProvider)
@@ -3404,10 +3403,10 @@
return *m_renderingUpdateScheduler;
}
-void Page::forEachDocument(const Function<void(Document&)>& functor) const
+void Page::forEachDocumentFromMainFrame(const Frame& mainFrame, const Function<void(Document&)>& functor)
{
Vector<Ref<Document>> documents;
- for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ for (auto* frame = &mainFrame; frame; frame = frame->tree().traverseNext()) {
auto* document = frame->document();
if (!document)
continue;
@@ -3417,6 +3416,11 @@
functor(document);
}
+void Page::forEachDocument(const Function<void(Document&)>& functor) const
+{
+ forEachDocumentFromMainFrame(mainFrame(), functor);
+}
+
void Page::forEachMediaElement(const Function<void(HTMLMediaElement&)>& functor)
{
#if ENABLE(VIDEO)
@@ -3428,6 +3432,16 @@
#endif
}
+void Page::forEachFrameFromMainFrame(const Function<void(Frame&)>& functor)
+{
+ Vector<Ref<Frame>> frames;
+ for (auto* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
+ frames.append(*frame);
+
+ for (auto& frame : frames)
+ functor(frame);
+}
+
bool Page::allowsLoadFromURL(const URL& url, MainFrameMainResource mainFrameMainResource) const
{
if (mainFrameMainResource == MainFrameMainResource::No && !m_loadsSubresources)
Modified: trunk/Source/WebCore/page/Page.h (287109 => 287110)
--- trunk/Source/WebCore/page/Page.h 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/page/Page.h 2021-12-15 23:19:57 UTC (rev 287110)
@@ -892,6 +892,8 @@
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&)>&);
bool shouldDisableCorsForRequestTo(const URL&) const;
Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (287109 => 287110)
--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2021-12-15 22:34:30 UTC (rev 287109)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2021-12-15 23:19:57 UTC (rev 287110)
@@ -644,8 +644,9 @@
if (!isMainFrame())
return;
- for (Frame* frame = this; frame; frame = frame->tree().traverseNext(this))
- frame->document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, true), document());
+ Page::forEachDocumentFromMainFrame(*this, [pagehideEvent = eventNames().pagehideEvent, mainDocument = document()](Document& document) {
+ document.domWindow()->dispatchEvent(PageTransitionEvent::create(pagehideEvent, true), mainDocument);
+ });
}
void Frame::dispatchPageShowEventBeforeResume()
@@ -654,8 +655,9 @@
if (!isMainFrame())
return;
- for (Frame* frame = this; frame; frame = frame->tree().traverseNext(this))
- frame->document()->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pageshowEvent, true), document());
+ Page::forEachDocumentFromMainFrame(*this, [pageshowEvent = eventNames().pageshowEvent, mainDocument = document()](Document& document) {
+ document.domWindow()->dispatchEvent(PageTransitionEvent::create(pageshowEvent, true), mainDocument);
+ });
}
void Frame::setRangedSelectionBaseToCurrentSelection()
