| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 FrameLoadType loadType, | 393 FrameLoadType loadType, |
| 394 HistoryCommitType historyCommitType, | 394 HistoryCommitType historyCommitType, |
| 395 HistoryNavigationType navigationType) { | 395 HistoryNavigationType navigationType) { |
| 396 HistoryItem* oldItem = m_currentItem; | 396 HistoryItem* oldItem = m_currentItem; |
| 397 if (isBackForwardLoadType(loadType) && m_provisionalItem) | 397 if (isBackForwardLoadType(loadType) && m_provisionalItem) |
| 398 m_currentItem = m_provisionalItem.release(); | 398 m_currentItem = m_provisionalItem.release(); |
| 399 else | 399 else |
| 400 m_currentItem = HistoryItem::create(); | 400 m_currentItem = HistoryItem::create(); |
| 401 m_currentItem->setURL(m_documentLoader->urlForHistory()); | 401 m_currentItem->setURL(m_documentLoader->urlForHistory()); |
| 402 m_currentItem->setDocumentState(m_frame->document()->formElementsState()); | 402 m_currentItem->setDocumentState(m_frame->document()->formElementsState()); |
| 403 m_currentItem->setTarget(m_frame->tree().uniqueName()); | |
| 404 m_currentItem->setReferrer(SecurityPolicy::generateReferrer( | 403 m_currentItem->setReferrer(SecurityPolicy::generateReferrer( |
| 405 m_documentLoader->getRequest().getReferrerPolicy(), m_currentItem->url(), | 404 m_documentLoader->getRequest().getReferrerPolicy(), m_currentItem->url(), |
| 406 m_documentLoader->getRequest().httpReferrer())); | 405 m_documentLoader->getRequest().httpReferrer())); |
| 407 m_currentItem->setFormInfoFromRequest(m_documentLoader->getRequest()); | 406 m_currentItem->setFormInfoFromRequest(m_documentLoader->getRequest()); |
| 408 | 407 |
| 409 // Don't propagate state from the old item to the new item if there isn't an | 408 // Don't propagate state from the old item to the new item if there isn't an |
| 410 // old item (obviously), or if this is a back/forward navigation, since we | 409 // old item (obviously), or if this is a back/forward navigation, since we |
| 411 // explicitly want to restore the state we just committed. | 410 // explicitly want to restore the state we just committed. |
| 412 if (!oldItem || isBackForwardLoadType(loadType)) | 411 if (!oldItem || isBackForwardLoadType(loadType)) |
| 413 return; | 412 return; |
| (...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2036 m_isNavigationHandledByClient = true; | 2035 m_isNavigationHandledByClient = true; |
| 2037 InspectorInstrumentation::frameScheduledClientNavigation(m_frame); | 2036 InspectorInstrumentation::frameScheduledClientNavigation(m_frame); |
| 2038 } | 2037 } |
| 2039 | 2038 |
| 2040 void FrameLoader::clearNavigationHandledByClient() { | 2039 void FrameLoader::clearNavigationHandledByClient() { |
| 2041 m_isNavigationHandledByClient = false; | 2040 m_isNavigationHandledByClient = false; |
| 2042 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame); | 2041 InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame); |
| 2043 } | 2042 } |
| 2044 | 2043 |
| 2045 } // namespace blink | 2044 } // namespace blink |
| OLD | NEW |