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

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

Issue 2109633002: Executed HTTPS upgrade before notifying the start of the provisional load. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified cross site URL code. Created 4 years, 5 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
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp ('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 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 1448
1449 m_loadType = type; 1449 m_loadType = type;
1450 1450
1451 if (frameLoadRequest.form()) 1451 if (frameLoadRequest.form())
1452 client()->dispatchWillSubmitForm(frameLoadRequest.form()); 1452 client()->dispatchWillSubmitForm(frameLoadRequest.form());
1453 1453
1454 m_progressTracker->progressStarted(); 1454 m_progressTracker->progressStarted();
1455 if (m_provisionalDocumentLoader->isClientRedirect()) 1455 if (m_provisionalDocumentLoader->isClientRedirect())
1456 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); 1456 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
1457 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req uest().url()); 1457 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req uest().url());
1458 m_provisionalDocumentLoader->upgradeInsecureRequest();
1458 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadR equest.triggeringEvent()->platformTimeStamp() : 0; 1459 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadR equest.triggeringEvent()->platformTimeStamp() : 0;
1459 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); 1460 client()->dispatchDidStartProvisionalLoad(triggeringEventTime);
1460 ASSERT(m_provisionalDocumentLoader); 1461 ASSERT(m_provisionalDocumentLoader);
1461 m_provisionalDocumentLoader->startLoadingMainResource(); 1462 m_provisionalDocumentLoader->startLoadingMainResource();
1462 1463
1463 takeObjectSnapshot(); 1464 takeObjectSnapshot();
1464 } 1465 }
1465 1466
1466 void FrameLoader::applyUserAgent(ResourceRequest& request) 1467 void FrameLoader::applyUserAgent(ResourceRequest& request)
1467 { 1468 {
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1619 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1619 return tracedValue; 1620 return tracedValue;
1620 } 1621 }
1621 1622
1622 inline void FrameLoader::takeObjectSnapshot() const 1623 inline void FrameLoader::takeObjectSnapshot() const
1623 { 1624 {
1624 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1625 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1625 } 1626 }
1626 1627
1627 } // namespace blink 1628 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698