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 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1356 m_provisionalDocumentLoader = m_policyDocumentLoader.release(); | 1356 m_provisionalDocumentLoader = m_policyDocumentLoader.release(); |
1357 m_loadType = type; | 1357 m_loadType = type; |
1358 | 1358 |
1359 if (frameLoadRequest.form()) | 1359 if (frameLoadRequest.form()) |
1360 client()->dispatchWillSubmitForm(frameLoadRequest.form()); | 1360 client()->dispatchWillSubmitForm(frameLoadRequest.form()); |
1361 | 1361 |
1362 m_progressTracker->progressStarted(); | 1362 m_progressTracker->progressStarted(); |
1363 if (m_provisionalDocumentLoader->isClientRedirect()) | 1363 if (m_provisionalDocumentLoader->isClientRedirect()) |
1364 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); | 1364 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); |
1365 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req
uest().url()); | 1365 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req
uest().url()); |
1366 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? convertDOM
TimeStampToSeconds(frameLoadRequest.triggeringEvent()->timeStamp()) : 0; | 1366 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadR
equest.triggeringEvent()->platformTimeStamp() : 0; |
1367 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); | 1367 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); |
1368 ASSERT(m_provisionalDocumentLoader); | 1368 ASSERT(m_provisionalDocumentLoader); |
1369 m_provisionalDocumentLoader->startLoadingMainResource(); | 1369 m_provisionalDocumentLoader->startLoadingMainResource(); |
1370 } | 1370 } |
1371 | 1371 |
1372 void FrameLoader::applyUserAgent(ResourceRequest& request) | 1372 void FrameLoader::applyUserAgent(ResourceRequest& request) |
1373 { | 1373 { |
1374 String userAgent = this->userAgent(request.url()); | 1374 String userAgent = this->userAgent(request.url()); |
1375 ASSERT(!userAgent.isNull()); | 1375 ASSERT(!userAgent.isNull()); |
1376 request.setHTTPUserAgent(AtomicString(userAgent)); | 1376 request.setHTTPUserAgent(AtomicString(userAgent)); |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1522 // FIXME: We need a way to propagate insecure requests policy flags to | 1522 // FIXME: We need a way to propagate insecure requests policy flags to |
1523 // out-of-process frames. For now, we'll always use default behavior. | 1523 // out-of-process frames. For now, we'll always use default behavior. |
1524 if (!parentFrame->isLocalFrame()) | 1524 if (!parentFrame->isLocalFrame()) |
1525 return nullptr; | 1525 return nullptr; |
1526 | 1526 |
1527 ASSERT(toLocalFrame(parentFrame)->document()); | 1527 ASSERT(toLocalFrame(parentFrame)->document()); |
1528 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1528 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
1529 } | 1529 } |
1530 | 1530 |
1531 } // namespace blink | 1531 } // namespace blink |
OLD | NEW |