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

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

Issue 270483003: Oilpan: Prepare to move HTMLFormElement, HTMLFormElement::PastNamesMap, FormKeyGenerator, and FormS… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: FIXME: Oilpan: Created 6 years, 7 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/FrameLoader.h ('k') | no next file » | 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 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 if (!targetFrames[i]->document()->dispatchBeforeUnloadEvent(page->ch rome(), didAllowNavigation)) 1212 if (!targetFrames[i]->document()->dispatchBeforeUnloadEvent(page->ch rome(), didAllowNavigation))
1213 break; 1213 break;
1214 } 1214 }
1215 1215
1216 if (i == targetFrames.size()) 1216 if (i == targetFrames.size())
1217 shouldClose = true; 1217 shouldClose = true;
1218 } 1218 }
1219 return shouldClose; 1219 return shouldClose;
1220 } 1220 }
1221 1221
1222 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtr<FormState> formState, const SubstituteData& substitute Data, ClientRedirectPolicy clientRedirect, const AtomicString& overrideEncoding) 1222 void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame LoadType type, PassRefPtrWillBeRawPtr<FormState> formState, const SubstituteData & substituteData, ClientRedirectPolicy clientRedirect, const AtomicString& overr ideEncoding)
1223 { 1223 {
1224 ASSERT(m_client->hasWebView()); 1224 ASSERT(m_client->hasWebView());
1225 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 1225 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
1226 return; 1226 return;
1227 1227
1228 const ResourceRequest& request = action.resourceRequest(); 1228 const ResourceRequest& request = action.resourceRequest();
1229 1229
1230 // The current load should replace the history item if it is the first real 1230 // The current load should replace the history item if it is the first real
1231 // load of the frame. 1231 // load of the frame.
1232 bool replacesCurrentHistoryItem = false; 1232 bool replacesCurrentHistoryItem = false;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 { 1405 {
1406 SandboxFlags flags = m_forcedSandboxFlags; 1406 SandboxFlags flags = m_forcedSandboxFlags;
1407 if (LocalFrame* parentFrame = m_frame->tree().parent()) 1407 if (LocalFrame* parentFrame = m_frame->tree().parent())
1408 flags |= parentFrame->document()->sandboxFlags(); 1408 flags |= parentFrame->document()->sandboxFlags();
1409 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1409 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1410 flags |= ownerElement->sandboxFlags(); 1410 flags |= ownerElement->sandboxFlags();
1411 return flags; 1411 return flags;
1412 } 1412 }
1413 1413
1414 } // namespace WebCore 1414 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698