| 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 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1386 m_loadType = type; | 1386 m_loadType = type; |
| 1387 | 1387 |
| 1388 if (frameLoadRequest.form()) | 1388 if (frameLoadRequest.form()) |
| 1389 client()->dispatchWillSubmitForm(frameLoadRequest.form()); | 1389 client()->dispatchWillSubmitForm(frameLoadRequest.form()); |
| 1390 | 1390 |
| 1391 m_progressTracker->progressStarted(); | 1391 m_progressTracker->progressStarted(); |
| 1392 if (m_provisionalDocumentLoader->isClientRedirect()) | 1392 if (m_provisionalDocumentLoader->isClientRedirect()) |
| 1393 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); | 1393 m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url()); |
| 1394 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req
uest().url()); | 1394 m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->req
uest().url()); |
| 1395 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadR
equest.triggeringEvent()->platformTimeStamp() : 0; | 1395 double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadR
equest.triggeringEvent()->platformTimeStamp() : 0; |
| 1396 |
| 1397 // Mark Navigation Start before we send DidStartProvisionalLoad, so we can |
| 1398 // IPC it to the browser. |
| 1399 m_provisionalDocumentLoader->timing().markNavigationStart(); |
| 1400 |
| 1396 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); | 1401 client()->dispatchDidStartProvisionalLoad(triggeringEventTime); |
| 1397 ASSERT(m_provisionalDocumentLoader); | 1402 ASSERT(m_provisionalDocumentLoader); |
| 1398 m_provisionalDocumentLoader->startLoadingMainResource(); | 1403 m_provisionalDocumentLoader->startLoadingMainResource(); |
| 1399 } | 1404 } |
| 1400 | 1405 |
| 1401 void FrameLoader::applyUserAgent(ResourceRequest& request) | 1406 void FrameLoader::applyUserAgent(ResourceRequest& request) |
| 1402 { | 1407 { |
| 1403 String userAgent = this->userAgent(); | 1408 String userAgent = this->userAgent(); |
| 1404 ASSERT(!userAgent.isNull()); | 1409 ASSERT(!userAgent.isNull()); |
| 1405 request.setHTTPUserAgent(AtomicString(userAgent)); | 1410 request.setHTTPUserAgent(AtomicString(userAgent)); |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1551 // FIXME: We need a way to propagate insecure requests policy flags to | 1556 // FIXME: We need a way to propagate insecure requests policy flags to |
| 1552 // out-of-process frames. For now, we'll always use default behavior. | 1557 // out-of-process frames. For now, we'll always use default behavior. |
| 1553 if (!parentFrame->isLocalFrame()) | 1558 if (!parentFrame->isLocalFrame()) |
| 1554 return nullptr; | 1559 return nullptr; |
| 1555 | 1560 |
| 1556 ASSERT(toLocalFrame(parentFrame)->document()); | 1561 ASSERT(toLocalFrame(parentFrame)->document()); |
| 1557 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1562 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
| 1558 } | 1563 } |
| 1559 | 1564 |
| 1560 } // namespace blink | 1565 } // namespace blink |
| OLD | NEW |