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

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

Issue 2198933003: Prevent mixed content iframes on back/forward. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 } 424 }
425 425
426 void FrameLoader::receivedFirstData() 426 void FrameLoader::receivedFirstData()
427 { 427 {
428 if (m_stateMachine.creatingInitialEmptyDocument()) 428 if (m_stateMachine.creatingInitialEmptyDocument())
429 return; 429 return;
430 430
431 HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType); 431 HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType);
432 if (historyCommitType == StandardCommit && (m_documentLoader->urlForHistory( ).isEmpty() || (opener() && !m_currentItem && m_documentLoader->originalRequest( ).url().isEmpty()))) 432 if (historyCommitType == StandardCommit && (m_documentLoader->urlForHistory( ).isEmpty() || (opener() && !m_currentItem && m_documentLoader->originalRequest( ).url().isEmpty())))
433 historyCommitType = HistoryInertCommit; 433 historyCommitType = HistoryInertCommit;
434 else if (historyCommitType == InitialCommitInChildFrame && MixedContentCheck er::isMixedContent(m_frame->tree().top()->securityContext()->getSecurityOrigin() , m_documentLoader->url()))
435 historyCommitType = HistoryInertCommit;
Charlie Reis 2016/08/01 23:39:16 This reverts the fix for https://crbug.com/348952,
436 setHistoryItemStateForCommit(m_loadType, historyCommitType, HistoryNavigatio nType::DifferentDocument); 434 setHistoryItemStateForCommit(m_loadType, historyCommitType, HistoryNavigatio nType::DifferentDocument);
437 435
438 if (!m_stateMachine.committedMultipleRealLoads() && m_loadType == FrameLoadT ypeStandard) 436 if (!m_stateMachine.committedMultipleRealLoads() && m_loadType == FrameLoadT ypeStandard)
439 m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedMultipleRealL oads); 437 m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedMultipleRealL oads);
440 438
441 client()->dispatchDidCommitLoad(m_currentItem.get(), historyCommitType); 439 client()->dispatchDidCommitLoad(m_currentItem.get(), historyCommitType);
442 440
443 // When the embedder gets notified (above) that the new navigation has 441 // When the embedder gets notified (above) that the new navigation has
444 // committed, the embedder will drop the old Content Security Policy and 442 // committed, the embedder will drop the old Content Security Policy and
445 // therefore now is a good time to report to the embedder the Content 443 // therefore now is a good time to report to the embedder the Content
(...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1614 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1617 return tracedValue; 1615 return tracedValue;
1618 } 1616 }
1619 1617
1620 inline void FrameLoader::takeObjectSnapshot() const 1618 inline void FrameLoader::takeObjectSnapshot() const
1621 { 1619 {
1622 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1620 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1623 } 1621 }
1624 1622
1625 } // namespace blink 1623 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698