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