Title: [280230] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 280230
- Author
- [email protected]
- Date
- 2021-07-23 01:47:06 -0700 (Fri, 23 Jul 2021)
Log Message
Merge r276611 - Remove redundant frameDetached() from the SVGImage destructor
https://bugs.webkit.org/show_bug.cgi?id=221616
<rdar://problem/74149106>
Reviewed by Chris Dumez.
SVGImage was originally written such that it has two separate objects:
a page and a frame; see https://trac.webkit.org/r18470. So it made sense
at that time to clean up the page and the frame separately. The Frame
was cleaned up by telling the frame's loader that the frameDetached().
This code is not necessary right now since the page owns the main frame.
And its destructor recursively detaches itself from all the frames.
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::~SVGImage):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280229 => 280230)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-23 08:29:54 UTC (rev 280229)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-07-23 08:47:06 UTC (rev 280230)
@@ -1,3 +1,22 @@
+2021-04-26 Said Abou-Hallawa <[email protected]>
+
+ Remove redundant frameDetached() from the SVGImage destructor
+ https://bugs.webkit.org/show_bug.cgi?id=221616
+ <rdar://problem/74149106>
+
+ Reviewed by Chris Dumez.
+
+ SVGImage was originally written such that it has two separate objects:
+ a page and a frame; see https://trac.webkit.org/r18470. So it made sense
+ at that time to clean up the page and the frame separately. The Frame
+ was cleaned up by telling the frame's loader that the frameDetached().
+
+ This code is not necessary right now since the page owns the main frame.
+ And its destructor recursively detaches itself from all the frames.
+
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::~SVGImage):
+
2021-04-17 Brent Fulgham <[email protected]>
Perform port blocking earlier in the load
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp (280229 => 280230)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp 2021-07-23 08:29:54 UTC (rev 280229)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/svg/graphics/SVGImage.cpp 2021-07-23 08:47:06 UTC (rev 280230)
@@ -86,9 +86,8 @@
{
if (m_page) {
ScriptDisallowedScope::DisableAssertionsInScope disabledScope;
- // Store m_page in a local variable, clearing m_page, so that SVGImageChromeClient knows we're destructed.
- std::unique_ptr<Page> currentPage = WTFMove(m_page);
- currentPage->mainFrame().loader().frameDetached(); // Break both the loader and view references to the frame
+ // Clear m_page, so that SVGImageChromeClient knows we're destructed.
+ m_page = nullptr;
}
// Verify that page teardown destroyed the Chrome
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
