| 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 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 page->chrome().focus(); | 745 page->chrome().focus(); |
| 746 return; | 746 return; |
| 747 } | 747 } |
| 748 | 748 |
| 749 FrameLoadType newLoadType = determineFrameLoadType(request); | 749 FrameLoadType newLoadType = determineFrameLoadType(request); |
| 750 NavigationAction action(request.resourceRequest(), newLoadType, request.form
State(), request.triggeringEvent()); | 750 NavigationAction action(request.resourceRequest(), newLoadType, request.form
State(), request.triggeringEvent()); |
| 751 if (shouldOpenInNewWindow(targetFrame.get(), request, action)) { | 751 if (shouldOpenInNewWindow(targetFrame.get(), request, action)) { |
| 752 if (action.policy() == NavigationPolicyDownload) | 752 if (action.policy() == NavigationPolicyDownload) |
| 753 m_client->loadURLExternally(action.resourceRequest(), NavigationPoli
cyDownload); | 753 m_client->loadURLExternally(action.resourceRequest(), NavigationPoli
cyDownload); |
| 754 else | 754 else |
| 755 createWindowForRequest(request, m_frame, action.policy(), request.sh
ouldSendReferrer()); | 755 createWindowForRequest(request, *m_frame, action.policy(), request.s
houldSendReferrer()); |
| 756 return; | 756 return; |
| 757 } | 757 } |
| 758 | 758 |
| 759 const KURL& url = request.resourceRequest().url(); | 759 const KURL& url = request.resourceRequest().url(); |
| 760 if (!action.shouldOpenInNewWindow() && shouldPerformFragmentNavigation(reque
st.formState(), request.resourceRequest().httpMethod(), newLoadType, url)) { | 760 if (!action.shouldOpenInNewWindow() && shouldPerformFragmentNavigation(reque
st.formState(), request.resourceRequest().httpMethod(), newLoadType, url)) { |
| 761 m_documentLoader->setTriggeringAction(action); | 761 m_documentLoader->setTriggeringAction(action); |
| 762 loadInSameDocument(url, nullptr, newLoadType == FrameLoadTypeStandard ?
UpdateBackForwardList : DoNotUpdateBackForwardList, request.clientRedirect()); | 762 loadInSameDocument(url, nullptr, newLoadType == FrameLoadTypeStandard ?
UpdateBackForwardList : DoNotUpdateBackForwardList, request.clientRedirect()); |
| 763 return; | 763 return; |
| 764 } | 764 } |
| 765 bool sameURL = url == m_documentLoader->urlForHistory(); | 765 bool sameURL = url == m_documentLoader->urlForHistory(); |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1460 { | 1460 { |
| 1461 SandboxFlags flags = m_forcedSandboxFlags; | 1461 SandboxFlags flags = m_forcedSandboxFlags; |
| 1462 if (LocalFrame* parentFrame = m_frame->tree().parent()) | 1462 if (LocalFrame* parentFrame = m_frame->tree().parent()) |
| 1463 flags |= parentFrame->document()->sandboxFlags(); | 1463 flags |= parentFrame->document()->sandboxFlags(); |
| 1464 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1464 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
| 1465 flags |= ownerElement->sandboxFlags(); | 1465 flags |= ownerElement->sandboxFlags(); |
| 1466 return flags; | 1466 return flags; |
| 1467 } | 1467 } |
| 1468 | 1468 |
| 1469 } // namespace WebCore | 1469 } // namespace WebCore |
| OLD | NEW |