OLD | NEW |
---|---|
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 Loading... | |
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(); | |
carlosk
2016/06/28 14:44:32
This was the best way I found to execute the upgra
| |
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 Loading... | |
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 |
OLD | NEW |