diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index 824de988e7c7..39a2492a1198 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -42,7 +42,7 @@ NS_NewHTMLVideoFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) NS_IMPL_FRAMEARENA_HELPERS(nsVideoFrame) nsVideoFrame::nsVideoFrame(nsStyleContext* aContext) - : nsVideoFrameBase(aContext) + : nsContainerFrame(aContext) { EnableVisibilityTracking(); } @@ -54,7 +54,7 @@ nsVideoFrame::~nsVideoFrame() NS_QUERYFRAME_HEAD(nsVideoFrame) NS_QUERYFRAME_ENTRY(nsVideoFrame) NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_TAIL_INHERITING(nsVideoFrameBase) +NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsresult nsVideoFrame::CreateAnonymousContent(nsTArray& aElements) @@ -145,7 +145,7 @@ nsVideoFrame::DestroyFrom(nsIFrame* aDestructRoot) nsContentUtils::DestroyAnonymousContent(&mCaptionDiv); nsContentUtils::DestroyAnonymousContent(&mVideoControls); nsContentUtils::DestroyAnonymousContent(&mPosterImage); - nsVideoFrameBase::DestroyFrom(aDestructRoot); + nsContainerFrame::DestroyFrom(aDestructRoot); } bool @@ -612,7 +612,7 @@ nsVideoFrame::AttributeChanged(int32_t aNameSpaceID, if (aAttribute == nsGkAtoms::poster && HasVideoElement()) { UpdatePosterSource(true); } - return nsVideoFrameBase::AttributeChanged(aNameSpaceID, + return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType); } @@ -623,13 +623,13 @@ nsVideoFrame::OnVisibilityChange(Visibility aNewVisibility, { nsCOMPtr imageLoader = do_QueryInterface(mPosterImage); if (!imageLoader) { - nsVideoFrameBase::OnVisibilityChange(aNewVisibility, aNonvisibleAction); + nsContainerFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction); return; } imageLoader->OnVisibilityChange(aNewVisibility, aNonvisibleAction); - nsVideoFrameBase::OnVisibilityChange(aNewVisibility, aNonvisibleAction); + nsContainerFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction); } bool nsVideoFrame::HasVideoElement() { diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h index 68c9009175d3..2a1ea54f8c8b 100644 --- a/layout/generic/nsVideoFrame.h +++ b/layout/generic/nsVideoFrame.h @@ -26,9 +26,8 @@ class nsAString; class nsPresContext; class nsDisplayItem; -typedef nsContainerFrame nsVideoFrameBase; - -class nsVideoFrame : public nsVideoFrameBase, public nsIAnonymousContentCreator +class nsVideoFrame : public nsContainerFrame + , public nsIAnonymousContentCreator { public: template using Maybe = mozilla::Maybe;