OOPIF: Call setCoreFrame on remote-to-local swaps.

Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 729 matching lines @@
 void WebLocalFrameImpl::setOpener(WebFrame* opener)
 {
     // TODO(alexmos): Remove this once didChangeOpener is implemented in
     // content, as all opener updates will go through it, including disowned
     // openers.
     if (WebFrame::opener() && !opener && m_client)
         m_client->didDisownOpener(this);
 
     WebFrame::setOpener(opener);
 
-    ASSERT(m_frame);

[alexmos, 2015/09/03 16:43:38]

This is the ASSERT.

[dcheng, 2015/09/03 16:51:43]

(Add a TODO to add this assert back once we don't have provisional local
frames?)

[alexmos, 2015/09/03 16:55:42]

Done.

     if (m_frame && m_frame->document())
         m_frame->document()->initSecurityContext();
 }
 
 WebDocument WebLocalFrameImpl::document() const
 {
     if (!frame() || !frame()->document())
         return WebDocument();
     return WebDocument(frame()->document());
 }
@@ skipping 1234 matching lines @@
 }
 
 void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame, const WebString& name, WebSandboxFlags flags)
 {
     Frame* oldFrame = toCoreFrame(oldWebFrame);
     // Note: this *always* temporarily sets a frame owner, even for main frames!
     // When a core Frame is created with no owner, it attempts to set itself as
     // the main frame of the Page. However, this is a provisional frame, and may
     // disappear, so Page::m_mainFrame can't be updated just yet.
     OwnPtrWillBeRawPtr<FrameOwner> tempOwner = RemoteBridgeFrameOwner::create(nullptr, SandboxNone);
-    m_frame = LocalFrame::create(m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get());
-    m_frame->setOwner(oldFrame->owner());
-    if (m_frame->owner() && !m_frame->owner()->isLocal())
-        toRemoteBridgeFrameOwner(m_frame->owner())->setSandboxFlags(static_cast<SandboxFlags>(flags));
-    m_frame->tree().setName(name);
+    RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get());
+    frame->setOwner(oldFrame->owner());
+    if (frame->owner() && !frame->owner()->isLocal())
+        toRemoteBridgeFrameOwner(frame->owner())->setSandboxFlags(static_cast<SandboxFlags>(flags));
+    frame->tree().setName(name);
     setParent(oldWebFrame->parent());
     setOpener(oldWebFrame->opener());
+    setCoreFrame(frame);

[alexmos, 2015/09/03 16:33:55]

I wanted to do this after setting up the tree relationships, since this calls
into code that may check them (for example,
GeolocationController::GeolocationController checks isMainFrame()).  Hence the
removal of the ASSERT in setOpener, which will be called with a null m_frame
here (I think not calling initSecurityContext there is actually better -
probably no point in doing it before we init the frame).

[dcheng, 2015/09/03 16:42:09]

Which assert is this that you're referring to? I don't seem to see it in this
patch.

[alexmos, 2015/09/03 16:43:38]

The one I removed above in WebLocalFrameImpl::setOpener

[dcheng, 2015/09/03 16:51:22]

Err, oops. I think it's a /little/ weird to remove the assert, but I'm willing
to live with it for now: once we don't have provisional local frames anymore, we
should restore the assert though.

     // We must call init() after m_frame is assigned because it is referenced
     // during init(). Note that this may dispatch JS events; the frame may be
     // detached after init() returns.
-    m_frame->init();
+    frame->init();
 }
 
 void WebLocalFrameImpl::setAutofillClient(WebAutofillClient* autofillClient)
 {
     m_autofillClient = autofillClient;
 }
 
 WebAutofillClient* WebLocalFrameImpl::autofillClient()
 {
     return m_autofillClient;
@@ skipping 170 matching lines @@
 }
 
 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
 {
     if (!frame())
         return WebSandboxFlags::None;
     return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags());
 }
 
 } // namespace blink