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

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 1191393007: Move setOpener from FrameLoader::detach to Frame::detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Implement RemoteFrameClientImpl::setOpener Created 5 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 m_documentLoader->detachFromFrame(); 1147 m_documentLoader->detachFromFrame();
1148 m_documentLoader = nullptr; 1148 m_documentLoader = nullptr;
1149 1149
1150 Frame* parent = m_frame->tree().parent(); 1150 Frame* parent = m_frame->tree().parent();
1151 if (parent && parent->isLocalFrame()) 1151 if (parent && parent->isLocalFrame())
1152 toLocalFrame(parent)->loader().scheduleCheckCompleted(); 1152 toLocalFrame(parent)->loader().scheduleCheckCompleted();
1153 if (m_progressTracker) { 1153 if (m_progressTracker) {
1154 m_progressTracker->dispose(); 1154 m_progressTracker->dispose();
1155 m_progressTracker.clear(); 1155 m_progressTracker.clear();
1156 } 1156 }
1157 setOpener(0);
1158 } 1157 }
1159 1158
1160 void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour ceError& error) 1159 void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour ceError& error)
1161 { 1160 {
1162 // Retain because the stop may release the last reference to it. 1161 // Retain because the stop may release the last reference to it.
1163 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); 1162 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());
1164 RefPtrWillBeRawPtr<DocumentLoader> protectDocumentLoader(loader); 1163 RefPtrWillBeRawPtr<DocumentLoader> protectDocumentLoader(loader);
1165 1164
1166 // FIXME: We really ought to be able to just check for isCancellation() here , but there are some 1165 // FIXME: We really ought to be able to just check for isCancellation() here , but there are some
1167 // ResourceErrors that setIsCancellation() but aren't created by ResourceErr or::cancelledError(). 1166 // ResourceErrors that setIsCancellation() but aren't created by ResourceErr or::cancelledError().
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 // FIXME: We need a way to propagate insecure requests policy flags to 1481 // FIXME: We need a way to propagate insecure requests policy flags to
1483 // out-of-process frames. For now, we'll always use default behavior. 1482 // out-of-process frames. For now, we'll always use default behavior.
1484 if (!parentFrame->isLocalFrame()) 1483 if (!parentFrame->isLocalFrame())
1485 return nullptr; 1484 return nullptr;
1486 1485
1487 ASSERT(toLocalFrame(parentFrame)->document()); 1486 ASSERT(toLocalFrame(parentFrame)->document());
1488 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1487 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1489 } 1488 }
1490 1489
1491 } // namespace blink 1490 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698