| 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 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 // From the HTML5 spec for location.assign(): | 942 // From the HTML5 spec for location.assign(): |
| 943 // "If the browsing context's session history contains only one Document, | 943 // "If the browsing context's session history contains only one Document, |
| 944 // and that was the about:blank Document created when the browsing context | 944 // and that was the about:blank Document created when the browsing context |
| 945 // was created, then the navigation must be done with replacement enabled." | 945 // was created, then the navigation must be done with replacement enabled." |
| 946 if (request.replacesCurrentItem() || | 946 if (request.replacesCurrentItem() || |
| 947 (!m_stateMachine.committedMultipleRealLoads() && | 947 (!m_stateMachine.committedMultipleRealLoads() && |
| 948 equalIgnoringCase(m_frame->document()->url(), blankURL()))) | 948 equalIgnoringCase(m_frame->document()->url(), blankURL()))) |
| 949 return FrameLoadTypeReplaceCurrentItem; | 949 return FrameLoadTypeReplaceCurrentItem; |
| 950 | 950 |
| 951 if (request.resourceRequest().url() == m_documentLoader->urlForHistory()) { | 951 if (request.resourceRequest().url() == m_documentLoader->urlForHistory()) { |
| 952 if (request.resourceRequest().httpMethod() == HTTPNames::POST) |
| 953 return FrameLoadTypeStandard; |
| 952 if (!request.originDocument()) | 954 if (!request.originDocument()) |
| 953 return FrameLoadTypeReloadMainResource; | 955 return FrameLoadTypeReloadMainResource; |
| 954 return request.resourceRequest().httpMethod() == HTTPNames::POST | 956 return FrameLoadTypeReplaceCurrentItem; |
| 955 ? FrameLoadTypeStandard | |
| 956 : FrameLoadTypeReplaceCurrentItem; | |
| 957 } | 957 } |
| 958 | 958 |
| 959 if (request.substituteData().failingURL() == | 959 if (request.substituteData().failingURL() == |
| 960 m_documentLoader->urlForHistory() && | 960 m_documentLoader->urlForHistory() && |
| 961 m_loadType == FrameLoadTypeReload) | 961 m_loadType == FrameLoadTypeReload) |
| 962 return FrameLoadTypeReload; | 962 return FrameLoadTypeReload; |
| 963 | 963 |
| 964 if (m_frame->settings()->getHistoryEntryRequiresUserGesture() && | 964 if (m_frame->settings()->getHistoryEntryRequiresUserGesture() && |
| 965 request.originDocument() && | 965 request.originDocument() && |
| 966 !request.originDocument()->hasReceivedUserGesture()) | 966 !request.originDocument()->hasReceivedUserGesture()) |
| (...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1906 m_documentLoader ? m_documentLoader->url() : String()); | 1906 m_documentLoader ? m_documentLoader->url() : String()); |
| 1907 return tracedValue; | 1907 return tracedValue; |
| 1908 } | 1908 } |
| 1909 | 1909 |
| 1910 inline void FrameLoader::takeObjectSnapshot() const { | 1910 inline void FrameLoader::takeObjectSnapshot() const { |
| 1911 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1911 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1912 toTracedValue()); | 1912 toTracedValue()); |
| 1913 } | 1913 } |
| 1914 | 1914 |
| 1915 } // namespace blink | 1915 } // namespace blink |
| OLD | NEW |