| 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 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1430 // beforeunload fired above, and detaching a DocumentLoader can fire | 1430 // beforeunload fired above, and detaching a DocumentLoader can fire |
| 1431 // events, which can detach this frame. | 1431 // events, which can detach this frame. |
| 1432 if (!m_frame->host()) | 1432 if (!m_frame->host()) |
| 1433 return; | 1433 return; |
| 1434 | 1434 |
| 1435 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, reques
t, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData
() : defaultSubstituteDataForURL(request.url())); | 1435 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, reques
t, frameLoadRequest.substituteData().isValid() ? frameLoadRequest.substituteData
() : defaultSubstituteDataForURL(request.url())); |
| 1436 m_provisionalDocumentLoader->setNavigationType(navigationType); | 1436 m_provisionalDocumentLoader->setNavigationType(navigationType); |
| 1437 m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(type == FrameLoad
TypeReplaceCurrentItem); | 1437 m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(type == FrameLoad
TypeReplaceCurrentItem); |
| 1438 m_provisionalDocumentLoader->setIsClientRedirect(frameLoadRequest.clientRedi
rect() == ClientRedirectPolicy::ClientRedirect); | 1438 m_provisionalDocumentLoader->setIsClientRedirect(frameLoadRequest.clientRedi
rect() == ClientRedirectPolicy::ClientRedirect); |
| 1439 | 1439 |
| 1440 InspectorInstrumentation::didStartProvisionalLoad(m_frame); | |
| 1441 | |
| 1442 m_frame->navigationScheduler().cancel(); | 1440 m_frame->navigationScheduler().cancel(); |
| 1443 m_checkTimer.stop(); | 1441 m_checkTimer.stop(); |
| 1444 | 1442 |
| 1445 m_loadType = type; | 1443 m_loadType = type; |
| 1446 | 1444 |
| 1447 if (frameLoadRequest.form()) | 1445 if (frameLoadRequest.form()) |
| 1448 client()->dispatchWillSubmitForm(frameLoadRequest.form()); | 1446 client()->dispatchWillSubmitForm(frameLoadRequest.form()); |
| 1449 | 1447 |
| 1450 m_progressTracker->progressStarted(); | 1448 m_progressTracker->progressStarted(); |
| 1451 if (m_provisionalDocumentLoader->isClientRedirect()) | 1449 if (m_provisionalDocumentLoader->isClientRedirect()) |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1615 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1613 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1616 return tracedValue; | 1614 return tracedValue; |
| 1617 } | 1615 } |
| 1618 | 1616 |
| 1619 inline void FrameLoader::takeObjectSnapshot() const | 1617 inline void FrameLoader::takeObjectSnapshot() const |
| 1620 { | 1618 { |
| 1621 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1619 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1622 } | 1620 } |
| 1623 | 1621 |
| 1624 } // namespace blink | 1622 } // namespace blink |
| OLD | NEW |