| Index: Source/core/html/HTMLFrameOwnerElement.cpp
|
| diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp
|
| index d0728672d0173dd7d072ecb87c7af1c327b65918..45e8831348333d6e53f57b51917a1f8f4578a019 100644
|
| --- a/Source/core/html/HTMLFrameOwnerElement.cpp
|
| +++ b/Source/core/html/HTMLFrameOwnerElement.cpp
|
| @@ -50,14 +50,13 @@ RenderPart* HTMLFrameOwnerElement::renderPart() const
|
| return toRenderPart(renderer());
|
| }
|
|
|
| -void HTMLFrameOwnerElement::setContentFrame(Frame* frame)
|
| +void HTMLFrameOwnerElement::setContentFrame(Frame& frame)
|
| {
|
| // Make sure we will not end up with two frames referencing the same owner element.
|
| ASSERT(!m_contentFrame || m_contentFrame->ownerElement() != this);
|
| - ASSERT(frame);
|
| // Disconnected frames should not be allowed to load.
|
| ASSERT(inDocument());
|
| - m_contentFrame = frame;
|
| + m_contentFrame = &frame;
|
|
|
| for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
|
| node->incrementConnectedSubframeCount();
|
| @@ -136,7 +135,7 @@ bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic
|
| return false;
|
| }
|
|
|
| - if (!SubframeLoadingDisabler::canLoadFrame(this))
|
| + if (!SubframeLoadingDisabler::canLoadFrame(*this))
|
| return false;
|
|
|
| String referrer = SecurityPolicy::generateReferrerHeader(document().referrerPolicy(), url, parentFrame->loader().outgoingReferrer());
|
|
|