| 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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 setReferrerForFrameRequest(request.resourceRequest(), request.getShouldSendR
eferrer(), request.originDocument()); | 951 setReferrerForFrameRequest(request.resourceRequest(), request.getShouldSendR
eferrer(), request.originDocument()); |
| 952 | 952 |
| 953 FrameLoadType newLoadType = (frameLoadType == FrameLoadTypeStandard) ? | 953 FrameLoadType newLoadType = (frameLoadType == FrameLoadTypeStandard) ? |
| 954 determineFrameLoadType(request) : frameLoadType; | 954 determineFrameLoadType(request) : frameLoadType; |
| 955 NavigationPolicy policy = navigationPolicyForRequest(request); | 955 NavigationPolicy policy = navigationPolicyForRequest(request); |
| 956 if (shouldOpenInNewWindow(targetFrame, request, policy)) { | 956 if (shouldOpenInNewWindow(targetFrame, request, policy)) { |
| 957 if (policy == NavigationPolicyDownload) { | 957 if (policy == NavigationPolicyDownload) { |
| 958 client()->loadURLExternally(request.resourceRequest(), NavigationPol
icyDownload, String(), false); | 958 client()->loadURLExternally(request.resourceRequest(), NavigationPol
icyDownload, String(), false); |
| 959 } else { | 959 } else { |
| 960 request.resourceRequest().setFrameType(WebURLRequest::FrameTypeAuxil
iary); | 960 request.resourceRequest().setFrameType(WebURLRequest::FrameTypeAuxil
iary); |
| 961 createWindowForRequest(request, *m_frame, policy, request.getShouldS
endReferrer(), request.getShouldSetOpener()); | 961 createWindowForRequest(request, *m_frame, policy); |
| 962 } | 962 } |
| 963 return; | 963 return; |
| 964 } | 964 } |
| 965 | 965 |
| 966 const KURL& url = request.resourceRequest().url(); | 966 const KURL& url = request.resourceRequest().url(); |
| 967 bool sameDocumentHistoryNavigation = | 967 bool sameDocumentHistoryNavigation = |
| 968 isBackForwardLoadType(newLoadType) && historyLoadType == HistorySameDocu
mentLoad; | 968 isBackForwardLoadType(newLoadType) && historyLoadType == HistorySameDocu
mentLoad; |
| 969 bool sameDocumentNavigation = policy == NavigationPolicyCurrentTab | 969 bool sameDocumentNavigation = policy == NavigationPolicyCurrentTab |
| 970 && shouldPerformFragmentNavigation( | 970 && shouldPerformFragmentNavigation( |
| 971 request.form(), request.resourceRequest().httpMethod(), newLoadType,
url); | 971 request.form(), request.resourceRequest().httpMethod(), newLoadType,
url); |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1628 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1628 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1629 return tracedValue; | 1629 return tracedValue; |
| 1630 } | 1630 } |
| 1631 | 1631 |
| 1632 inline void FrameLoader::takeObjectSnapshot() const | 1632 inline void FrameLoader::takeObjectSnapshot() const |
| 1633 { | 1633 { |
| 1634 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1634 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1635 } | 1635 } |
| 1636 | 1636 |
| 1637 } // namespace blink | 1637 } // namespace blink |
| OLD | NEW |