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

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

Issue 680273004: Never fire popstate event when navigating between documents (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « LayoutTests/fast/loader/stateobjects/resources/replacestate-in-iframe-window-child.html ('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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 367
368 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get()); 368 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
369 m_frame->page()->didCommitLoad(m_frame); 369 m_frame->page()->didCommitLoad(m_frame);
370 dispatchDidClearDocumentOfWindowObject(); 370 dispatchDidClearDocumentOfWindowObject();
371 } 371 }
372 372
373 void FrameLoader::didBeginDocument(bool dispatch) 373 void FrameLoader::didBeginDocument(bool dispatch)
374 { 374 {
375 m_frame->document()->setReadyState(Document::Loading); 375 m_frame->document()->setReadyState(Document::Loading);
376 376
377 if (m_provisionalItem && (m_loadType == FrameLoadTypeBackForward || m_loadTy pe == FrameLoadTypeInitialHistoryLoad))
378 m_frame->domWindow()->statePopped(m_provisionalItem->stateObject());
379
380 if (dispatch) 377 if (dispatch)
381 dispatchDidClearDocumentOfWindowObject(); 378 dispatchDidClearDocumentOfWindowObject();
382 379
383 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create()); 380 m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_document Loader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create());
384 381
385 Settings* settings = m_frame->document()->settings(); 382 Settings* settings = m_frame->document()->settings();
386 if (settings) { 383 if (settings) {
387 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ()); 384 m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled ());
388 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically()); 385 m_frame->document()->fetcher()->setAutoLoadImages(settings->loadsImagesA utomatically());
389 } 386 }
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1442 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1446 Frame* parentFrame = m_frame->tree().parent(); 1443 Frame* parentFrame = m_frame->tree().parent();
1447 if (parentFrame && parentFrame->isLocalFrame()) 1444 if (parentFrame && parentFrame->isLocalFrame())
1448 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1445 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1449 if (FrameOwner* frameOwner = m_frame->owner()) 1446 if (FrameOwner* frameOwner = m_frame->owner())
1450 flags |= frameOwner->sandboxFlags(); 1447 flags |= frameOwner->sandboxFlags();
1451 return flags; 1448 return flags;
1452 } 1449 }
1453 1450
1454 } // namespace blink 1451 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/loader/stateobjects/resources/replacestate-in-iframe-window-child.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698