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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 FrameLoadType loadType, | 406 FrameLoadType loadType, |
407 HistoryCommitType historyCommitType, | 407 HistoryCommitType historyCommitType, |
408 HistoryNavigationType navigationType) { | 408 HistoryNavigationType navigationType) { |
409 HistoryItem* oldItem = m_currentItem; | 409 HistoryItem* oldItem = m_currentItem; |
410 if (isBackForwardLoadType(loadType) && m_provisionalItem) | 410 if (isBackForwardLoadType(loadType) && m_provisionalItem) |
411 m_currentItem = m_provisionalItem.release(); | 411 m_currentItem = m_provisionalItem.release(); |
412 else | 412 else |
413 m_currentItem = HistoryItem::create(); | 413 m_currentItem = HistoryItem::create(); |
414 m_currentItem->setURL(m_documentLoader->urlForHistory()); | 414 m_currentItem->setURL(m_documentLoader->urlForHistory()); |
415 m_currentItem->setDocumentState(m_frame->document()->formElementsState()); | 415 m_currentItem->setDocumentState(m_frame->document()->formElementsState()); |
416 m_currentItem->setTarget(m_frame->tree().uniqueName()); | |
417 m_currentItem->setReferrer(SecurityPolicy::generateReferrer( | 416 m_currentItem->setReferrer(SecurityPolicy::generateReferrer( |
418 m_documentLoader->getRequest().getReferrerPolicy(), m_currentItem->url(), | 417 m_documentLoader->getRequest().getReferrerPolicy(), m_currentItem->url(), |
419 m_documentLoader->getRequest().httpReferrer())); | 418 m_documentLoader->getRequest().httpReferrer())); |
420 m_currentItem->setFormInfoFromRequest(m_documentLoader->getRequest()); | 419 m_currentItem->setFormInfoFromRequest(m_documentLoader->getRequest()); |
421 | 420 |
422 // Don't propagate state from the old item to the new item if there isn't an | 421 // Don't propagate state from the old item to the new item if there isn't an |
423 // old item (obviously), or if this is a back/forward navigation, since we | 422 // old item (obviously), or if this is a back/forward navigation, since we |
424 // explicitly want to restore the state we just committed. | 423 // explicitly want to restore the state we just committed. |
425 if (!oldItem || isBackForwardLoadType(loadType)) | 424 if (!oldItem || isBackForwardLoadType(loadType)) |
426 return; | 425 return; |
(...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1903 frameLoadRequest.clientRedirect()); | 1902 frameLoadRequest.clientRedirect()); |
1904 | 1903 |
1905 loader->setLoadType(loadType); | 1904 loader->setLoadType(loadType); |
1906 loader->setNavigationType(navigationType); | 1905 loader->setNavigationType(navigationType); |
1907 loader->setReplacesCurrentHistoryItem(loadType == | 1906 loader->setReplacesCurrentHistoryItem(loadType == |
1908 FrameLoadTypeReplaceCurrentItem); | 1907 FrameLoadTypeReplaceCurrentItem); |
1909 return loader; | 1908 return loader; |
1910 } | 1909 } |
1911 | 1910 |
1912 } // namespace blink | 1911 } // namespace blink |
OLD | NEW |