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

Unified Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 573353002: Plumbing toward transitioning remote frame back to a local frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: forward declarations, drop a spurious parameter Created 6 years, 3 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/core/frame/RemoteFrameClient.h ('k') | Source/web/RemoteFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp
index 014638445263f52c4767624a3e398f2aebc0084d..175b6ac0d4948abbbe4b1824ab5eece18d39dac8 100644
--- a/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -239,9 +239,8 @@ Widget* HTMLFrameOwnerElement::ownedWidget() const
bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const AtomicString& frameName, bool lockBackForwardList)
{
RefPtrWillBeRawPtr<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()->navigate(document(), url, Referrer(document().outgoingReferrer(), document().referrerPolicy()), lockBackForwardList);
return true;
}
« no previous file with comments | « Source/core/frame/RemoteFrameClient.h ('k') | Source/web/RemoteFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698