Delay calling FrameOwner::setWidget when doing a remote->local frame transition

Source/core/frame/LocalFrame.cpp

Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 43bcd9c4211cf7ee98b2ac6db11f43611f02b05e..0e2ae7bfc6bbb4bb13862f3f86c482b10bce9676 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -483,7 +483,11 @@ void LocalFrame::createView(const IntSize& viewportSize, const Color& background
     if (ownerRenderer()) {
         HTMLFrameOwnerElement* owner = deprecatedLocalOwner();
         ASSERT(owner);
-        owner->setWidget(frameView);
+        // FIXME: OOPI might lead to us temporarily lying to a frame and telling it
+        // that it's owned by a FrameOwner that knows nothing about it. If we're
+        // lying to this frame, don't let it clobber the existing widget.
+        if (owner->contentFrame() == this)
+            owner->setWidget(frameView);
     }
 
     if (HTMLFrameOwnerElement* owner = deprecatedLocalOwner())