| 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 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 if (!m_frame->page()) | 351 if (!m_frame->page()) |
| 352 return; | 352 return; |
| 353 | 353 |
| 354 client()->transitionToCommittedForNewPage(); | 354 client()->transitionToCommittedForNewPage(); |
| 355 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source); | 355 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source); |
| 356 } | 356 } |
| 357 | 357 |
| 358 void FrameLoader::receivedMainResourceRedirect(const KURL& newURL) | 358 void FrameLoader::receivedMainResourceRedirect(const KURL& newURL) |
| 359 { | 359 { |
| 360 client()->dispatchDidReceiveServerRedirectForProvisionalLoad(); | 360 client()->dispatchDidReceiveServerRedirectForProvisionalLoad(); |
| 361 // If a back/forward navigation redirects cross-origin, don't reuse any stat
e from the HistoryItem. | 361 |
| 362 if (m_provisionalItem && !SecurityOrigin::create(m_provisionalItem->url())->
isSameSchemeHostPort(SecurityOrigin::create(newURL).get())) | 362 // If a back/forward navigation redirects, don't reuse any state from the Hi
storyItem. |
| 363 m_provisionalItem.clear(); | 363 m_provisionalItem.clear(); |
| 364 } | 364 } |
| 365 | 365 |
| 366 void FrameLoader::setHistoryItemStateForCommit(FrameLoadType loadType, HistoryCo
mmitType historyCommitType, HistoryNavigationType navigationType) | 366 void FrameLoader::setHistoryItemStateForCommit(FrameLoadType loadType, HistoryCo
mmitType historyCommitType, HistoryNavigationType navigationType) |
| 367 { | 367 { |
| 368 HistoryItem* oldItem = m_currentItem; | 368 HistoryItem* oldItem = m_currentItem; |
| 369 if (isBackForwardLoadType(loadType) && m_provisionalItem) | 369 if (isBackForwardLoadType(loadType) && m_provisionalItem) |
| 370 m_currentItem = m_provisionalItem.release(); | 370 m_currentItem = m_provisionalItem.release(); |
| 371 else | 371 else |
| 372 m_currentItem = HistoryItem::create(); | 372 m_currentItem = HistoryItem::create(); |
| 373 m_currentItem->setURL(m_documentLoader->urlForHistory()); | 373 m_currentItem->setURL(m_documentLoader->urlForHistory()); |
| (...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1616 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1616 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1617 return tracedValue; | 1617 return tracedValue; |
| 1618 } | 1618 } |
| 1619 | 1619 |
| 1620 inline void FrameLoader::takeObjectSnapshot() const | 1620 inline void FrameLoader::takeObjectSnapshot() const |
| 1621 { | 1621 { |
| 1622 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1622 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1623 } | 1623 } |
| 1624 | 1624 |
| 1625 } // namespace blink | 1625 } // namespace blink |
| OLD | NEW |