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

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

Issue 1476953004: Consolidate functions for updating state after a security origin change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 // trigger event listeners for 'abort'. These event listeners might detach 1061 // trigger event listeners for 'abort'. These event listeners might detach
1062 // the frame. 1062 // the frame.
1063 // TODO(dcheng): Investigate if this can be moved above the check that 1063 // TODO(dcheng): Investigate if this can be moved above the check that
1064 // m_provisionalDocumentLoader hasn't changed. 1064 // m_provisionalDocumentLoader hasn't changed.
1065 if (!m_frame->client()) 1065 if (!m_frame->client())
1066 return false; 1066 return false;
1067 // No more events will be dispatched so detach the Document. 1067 // No more events will be dispatched so detach the Document.
1068 if (m_frame->document()) 1068 if (m_frame->document())
1069 m_frame->document()->detach(); 1069 m_frame->document()->detach();
1070 m_documentLoader = m_provisionalDocumentLoader.release(); 1070 m_documentLoader = m_provisionalDocumentLoader.release();
1071 m_frame->updateFrameSecurityOrigin();
dcheng 2015/11/26 21:16:30 In this case, the frame scheduler update has no se
1072 1071
1073 return true; 1072 return true;
1074 } 1073 }
1075 1074
1076 void FrameLoader::commitProvisionalLoad() 1075 void FrameLoader::commitProvisionalLoad()
1077 { 1076 {
1078 ASSERT(client()->hasWebView()); 1077 ASSERT(client()->hasWebView());
1079 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); 1078 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());
1080 1079
1081 // Check if the destination page is allowed to access the previous page's ti ming information. 1080 // Check if the destination page is allowed to access the previous page's ti ming information.
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 // FIXME: We need a way to propagate insecure requests policy flags to 1545 // FIXME: We need a way to propagate insecure requests policy flags to
1547 // out-of-process frames. For now, we'll always use default behavior. 1546 // out-of-process frames. For now, we'll always use default behavior.
1548 if (!parentFrame->isLocalFrame()) 1547 if (!parentFrame->isLocalFrame())
1549 return nullptr; 1548 return nullptr;
1550 1549
1551 ASSERT(toLocalFrame(parentFrame)->document()); 1550 ASSERT(toLocalFrame(parentFrame)->document());
1552 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1551 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1553 } 1552 }
1554 1553
1555 } // namespace blink 1554 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/public/platform/WebFrameScheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698