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

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

Issue 1013213002: Fix template angle bracket syntax in core (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/ImageLoader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToPar ent(true); 1137 toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToPar ent(true);
1138 } 1138 }
1139 1139
1140 bool FrameLoader::shouldClose() 1140 bool FrameLoader::shouldClose()
1141 { 1141 {
1142 Page* page = m_frame->page(); 1142 Page* page = m_frame->page();
1143 if (!page || !page->chrome().canRunBeforeUnloadConfirmPanel()) 1143 if (!page || !page->chrome().canRunBeforeUnloadConfirmPanel())
1144 return true; 1144 return true;
1145 1145
1146 // Store all references to each subframe in advance since beforeunload's eve nt handler may modify frame 1146 // Store all references to each subframe in advance since beforeunload's eve nt handler may modify frame
1147 WillBeHeapVector<RefPtrWillBeMember<LocalFrame> > targetFrames; 1147 WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> targetFrames;
1148 targetFrames.append(m_frame); 1148 targetFrames.append(m_frame);
1149 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree ().traverseNext(m_frame)) { 1149 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree ().traverseNext(m_frame)) {
1150 // FIXME: There is not yet any way to dispatch events to out-of-process frames. 1150 // FIXME: There is not yet any way to dispatch events to out-of-process frames.
1151 if (child->isLocalFrame()) 1151 if (child->isLocalFrame())
1152 targetFrames.append(toLocalFrame(child)); 1152 targetFrames.append(toLocalFrame(child));
1153 } 1153 }
1154 1154
1155 bool shouldClose = false; 1155 bool shouldClose = false;
1156 { 1156 {
1157 NavigationDisablerForBeforeUnload navigationDisabler; 1157 NavigationDisablerForBeforeUnload navigationDisabler;
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 1409
1410 // FIXME: We need a way to propagate insecure requests policy flags to 1410 // FIXME: We need a way to propagate insecure requests policy flags to
1411 // out-of-process frames. For now, we'll always use default behavior. 1411 // out-of-process frames. For now, we'll always use default behavior.
1412 if (!parentFrame->isLocalFrame()) 1412 if (!parentFrame->isLocalFrame())
1413 return SecurityContext::InsecureRequestsDoNotUpgrade; 1413 return SecurityContext::InsecureRequestsDoNotUpgrade;
1414 1414
1415 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy(); 1415 return toLocalFrame(parentFrame)->document()->insecureRequestsPolicy();
1416 } 1416 }
1417 1417
1418 } // namespace blink 1418 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/ImageLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698