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

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

Issue 710443002: Add didCreateNewDocument() notification (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 init.withNewRegistrationContext(); 300 init.withNewRegistrationContext();
301 301
302 stopAllLoaders(); 302 stopAllLoaders();
303 clear(); 303 clear();
304 304
305 // clear() potentially detaches the frame from the document. The 305 // clear() potentially detaches the frame from the document. The
306 // loading cannot continue in that case. 306 // loading cannot continue in that case.
307 if (!m_frame->page()) 307 if (!m_frame->page())
308 return; 308 return;
309 309
310 client()->dispatchWillReplaceDocumentWhileExecutingJavaScriptURL();
310 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, own erDocument); 311 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, own erDocument);
311 } 312 }
312 313
313 void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitTy pe, bool isPushOrReplaceState, PassRefPtr<SerializedScriptValue> stateObject) 314 void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitTy pe, bool isPushOrReplaceState, PassRefPtr<SerializedScriptValue> stateObject)
314 { 315 {
315 if (m_provisionalItem) 316 if (m_provisionalItem)
316 m_currentItem = m_provisionalItem.release(); 317 m_currentItem = m_provisionalItem.release();
317 318
318 if (!m_currentItem || historyCommitType == StandardCommit) { 319 if (!m_currentItem || historyCommitType == StandardCommit) {
319 m_currentItem = HistoryItem::create(); 320 m_currentItem = HistoryItem::create();
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1443 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1443 Frame* parentFrame = m_frame->tree().parent(); 1444 Frame* parentFrame = m_frame->tree().parent();
1444 if (parentFrame && parentFrame->isLocalFrame()) 1445 if (parentFrame && parentFrame->isLocalFrame())
1445 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1446 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1446 if (FrameOwner* frameOwner = m_frame->owner()) 1447 if (FrameOwner* frameOwner = m_frame->owner())
1447 flags |= frameOwner->sandboxFlags(); 1448 flags |= frameOwner->sandboxFlags();
1448 return flags; 1449 return flags;
1449 } 1450 }
1450 1451
1451 } // namespace blink 1452 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698