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

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

Issue 1149093010: Cleanup: Rename ChromeClient function names. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/loader/EmptyClients.cpp ('k') | Source/core/page/ChromeClient.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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 1154
1155 view->scrollToFragment(url); 1155 view->scrollToFragment(url);
1156 1156
1157 if (boundaryFrame && boundaryFrame->isLocalFrame()) 1157 if (boundaryFrame && boundaryFrame->isLocalFrame())
1158 toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToPar ent(true); 1158 toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToPar ent(true);
1159 } 1159 }
1160 1160
1161 bool FrameLoader::shouldClose() 1161 bool FrameLoader::shouldClose()
1162 { 1162 {
1163 Page* page = m_frame->page(); 1163 Page* page = m_frame->page();
1164 if (!page || !page->chromeClient().canRunBeforeUnloadConfirmPanel()) 1164 if (!page || !page->chromeClient().canOpenBeforeUnloadConfirmPanel())
1165 return true; 1165 return true;
1166 1166
1167 // Store all references to each subframe in advance since beforeunload's eve nt handler may modify frame 1167 // Store all references to each subframe in advance since beforeunload's eve nt handler may modify frame
1168 WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> targetFrames; 1168 WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> targetFrames;
1169 targetFrames.append(m_frame); 1169 targetFrames.append(m_frame);
1170 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree ().traverseNext(m_frame)) { 1170 for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree ().traverseNext(m_frame)) {
1171 // FIXME: There is not yet any way to dispatch events to out-of-process frames. 1171 // FIXME: There is not yet any way to dispatch events to out-of-process frames.
1172 if (child->isLocalFrame()) 1172 if (child->isLocalFrame())
1173 targetFrames.append(toLocalFrame(child)); 1173 targetFrames.append(toLocalFrame(child));
1174 } 1174 }
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 // FIXME: We need a way to propagate insecure requests policy flags to 1437 // FIXME: We need a way to propagate insecure requests policy flags to
1438 // out-of-process frames. For now, we'll always use default behavior. 1438 // out-of-process frames. For now, we'll always use default behavior.
1439 if (!parentFrame->isLocalFrame()) 1439 if (!parentFrame->isLocalFrame())
1440 return nullptr; 1440 return nullptr;
1441 1441
1442 ASSERT(toLocalFrame(parentFrame)->document()); 1442 ASSERT(toLocalFrame(parentFrame)->document());
1443 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1443 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1444 } 1444 }
1445 1445
1446 } // namespace blink 1446 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.cpp ('k') | Source/core/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698