From 797c3c86a1cdfbb576ca319dcda1ceb816f6695a Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Tue, 21 Jul 2020 16:11:29 +0000 Subject: [PATCH] Bug 1608501 - Part 2: Rename nsObjectLoadingContent::DestroyContent to ::Destroy; r=smaug Depends on D82729 Differential Revision: https://phabricator.services.mozilla.com/D84341 --- dom/base/nsObjectLoadingContent.cpp | 2 +- dom/base/nsObjectLoadingContent.h | 2 +- dom/html/HTMLEmbedElement.cpp | 2 +- dom/html/HTMLObjectElement.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index a88c7bb8bb92..f29eee303f32 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -2411,7 +2411,7 @@ uint32_t nsObjectLoadingContent::GetCapabilities() const { return eSupportImages | eSupportPlugins | eSupportDocuments; } -void nsObjectLoadingContent::DestroyContent() { +void nsObjectLoadingContent::Destroy() { if (mFrameLoader) { mFrameLoader->Destroy(); mFrameLoader = nullptr; diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h index ff39958988f1..e36924587c19 100644 --- a/dom/base/nsObjectLoadingContent.h +++ b/dom/base/nsObjectLoadingContent.h @@ -306,7 +306,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent, /** * Destroys all loaded documents/plugins and releases references */ - void DestroyContent(); + void Destroy(); static void Traverse(nsObjectLoadingContent* tmp, nsCycleCollectionTraversalCallback& cb); diff --git a/dom/html/HTMLEmbedElement.cpp b/dom/html/HTMLEmbedElement.cpp index 2bc6d060db92..37d70519e4a8 100644 --- a/dom/html/HTMLEmbedElement.cpp +++ b/dom/html/HTMLEmbedElement.cpp @@ -261,7 +261,7 @@ uint32_t HTMLEmbedElement::GetCapabilities() const { } void HTMLEmbedElement::DestroyContent() { - nsObjectLoadingContent::DestroyContent(); + nsObjectLoadingContent::Destroy(); nsGenericHTMLElement::DestroyContent(); } diff --git a/dom/html/HTMLObjectElement.cpp b/dom/html/HTMLObjectElement.cpp index 71048a057505..3f1ded40b9b7 100644 --- a/dom/html/HTMLObjectElement.cpp +++ b/dom/html/HTMLObjectElement.cpp @@ -447,7 +447,7 @@ uint32_t HTMLObjectElement::GetCapabilities() const { } void HTMLObjectElement::DestroyContent() { - nsObjectLoadingContent::DestroyContent(); + nsObjectLoadingContent::Destroy(); nsGenericHTMLFormElement::DestroyContent(); }