| Index: Source/core/html/HTMLFrameOwnerElement.cpp
|
| ===================================================================
|
| --- Source/core/html/HTMLFrameOwnerElement.cpp (revision 170478)
|
| +++ Source/core/html/HTMLFrameOwnerElement.cpp (working copy)
|
| @@ -51,7 +51,7 @@
|
| return toRenderPart(renderer());
|
| }
|
|
|
| -void HTMLFrameOwnerElement::setContentFrame(Frame& frame)
|
| +void HTMLFrameOwnerElement::setContentFrame(LocalFrame& frame)
|
| {
|
| // Make sure we will not end up with two frames referencing the same owner element.
|
| ASSERT(!m_contentFrame || m_contentFrame->ownerElement() != this);
|
| @@ -80,10 +80,9 @@
|
| // unload event in the subframe which could execute script that could then
|
| // reach up into this document and then attempt to look back down. We should
|
| // see if this behavior is really needed as Gecko does not allow this.
|
| - if (Frame* frame = contentFrame()) {
|
| - RefPtr<Frame> protect(frame);
|
| - if (frame->isLocalFrame())
|
| - toLocalFrame(frame)->loader().frameDetached();
|
| + if (LocalFrame* frame = contentFrame()) {
|
| + RefPtr<LocalFrame> protect(frame);
|
| + frame->loader().frameDetached();
|
| frame->disconnectOwnerElement();
|
| }
|
| }
|
| @@ -125,9 +124,8 @@
|
| bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const AtomicString& frameName, bool lockBackForwardList)
|
| {
|
| RefPtr<LocalFrame> parentFrame = document().frame();
|
| - // FIXME(kenrb): The necessary semantics for RemoteFrames have not been worked out yet, but this will likely need some logic to handle them.
|
| - if (contentFrame() && contentFrame()->isLocalFrame()) {
|
| - toLocalFrame(contentFrame())->navigationScheduler().scheduleLocationChange(&document(), url.string(), Referrer(document().outgoingReferrer(), document().referrerPolicy()), lockBackForwardList);
|
| + if (contentFrame()) {
|
| + contentFrame()->navigationScheduler().scheduleLocationChange(&document(), url.string(), Referrer(document().outgoingReferrer(), document().referrerPolicy()), lockBackForwardList);
|
| return true;
|
| }
|
|
|
|
|