| 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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 792 return allowed; | 792 return allowed; |
| 793 } | 793 } |
| 794 | 794 |
| 795 void FrameLoader::updateForSameDocumentNavigation( | 795 void FrameLoader::updateForSameDocumentNavigation( |
| 796 const KURL& newURL, | 796 const KURL& newURL, |
| 797 SameDocumentNavigationSource sameDocumentNavigationSource, | 797 SameDocumentNavigationSource sameDocumentNavigationSource, |
| 798 PassRefPtr<SerializedScriptValue> data, | 798 PassRefPtr<SerializedScriptValue> data, |
| 799 HistoryScrollRestorationType scrollRestorationType, | 799 HistoryScrollRestorationType scrollRestorationType, |
| 800 FrameLoadType type, | 800 FrameLoadType type, |
| 801 Document* initiatingDocument) { | 801 Document* initiatingDocument) { |
| 802 TRACE_EVENT1("blink", "FrameLoader::updateForSameDocumentNavigation", "url", |
| 803 newURL.getString().ascii().data()); |
| 802 // Update the data source's request with the new URL to fake the URL change | 804 // Update the data source's request with the new URL to fake the URL change |
| 803 m_frame->document()->setURL(newURL); | 805 m_frame->document()->setURL(newURL); |
| 804 documentLoader()->setReplacesCurrentHistoryItem(type != | 806 documentLoader()->setReplacesCurrentHistoryItem(type != |
| 805 FrameLoadTypeStandard); | 807 FrameLoadTypeStandard); |
| 806 documentLoader()->updateForSameDocumentNavigation( | 808 documentLoader()->updateForSameDocumentNavigation( |
| 807 newURL, sameDocumentNavigationSource); | 809 newURL, sameDocumentNavigationSource); |
| 808 | 810 |
| 809 // Generate start and stop notifications only when loader is completed so that | 811 // Generate start and stop notifications only when loader is completed so that |
| 810 // we don't fire them for fragment redirection that happens in window.onload | 812 // we don't fire them for fragment redirection that happens in window.onload |
| 811 // handler. See https://bugs.webkit.org/show_bug.cgi?id=31838 | 813 // handler. See https://bugs.webkit.org/show_bug.cgi?id=31838 |
| (...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1975 frameLoadRequest.clientRedirect()); | 1977 frameLoadRequest.clientRedirect()); |
| 1976 | 1978 |
| 1977 loader->setLoadType(loadType); | 1979 loader->setLoadType(loadType); |
| 1978 loader->setNavigationType(navigationType); | 1980 loader->setNavigationType(navigationType); |
| 1979 loader->setReplacesCurrentHistoryItem(loadType == | 1981 loader->setReplacesCurrentHistoryItem(loadType == |
| 1980 FrameLoadTypeReplaceCurrentItem); | 1982 FrameLoadTypeReplaceCurrentItem); |
| 1981 return loader; | 1983 return loader; |
| 1982 } | 1984 } |
| 1983 | 1985 |
| 1984 } // namespace blink | 1986 } // namespace blink |
| OLD | NEW |