Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1674)

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 948143002: Remove unused WebFrame::swap() path for local frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: nullptr Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebFrame.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index f48c85566e5f6a66c23438876de38b3076970bd2..fd63993a5853904f8315f022fd7aa279d3b8e236 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -1857,7 +1857,11 @@ void WebLocalFrameImpl::loadJavaScriptURL(const KURL& url)
void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame)
{
Frame* oldFrame = toCoreFrame(oldWebFrame);
- OwnPtrWillBePersistent<FrameOwner> tempOwner = RemoteBridgeFrameOwner::create(nullptr, SandboxNone);
dcheng 2015/02/23 21:05:12 Btw, is there ever a reason we'd want a stack Pers
haraken 2015/02/24 00:09:07 OwnPtrWillBeRawPtr is a right pointer here. In un
+ // 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, oldFrame->host(), tempOwner.get());
m_frame->setOwner(oldFrame->owner());
m_frame->tree().setName(oldFrame->tree().name());
« no previous file with comments | « Source/web/WebFrame.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698