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 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 | 1077 |
1078 // Check if the destination page is allowed to access the previous page's ti
ming information. | 1078 // Check if the destination page is allowed to access the previous page's ti
ming information. |
1079 if (m_frame->document()) { | 1079 if (m_frame->document()) { |
1080 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi
onalDocumentLoader->request().url()); | 1080 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi
onalDocumentLoader->request().url()); |
1081 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument
(securityOrigin->canRequest(m_frame->document()->url())); | 1081 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument
(securityOrigin->canRequest(m_frame->document()->url())); |
1082 } | 1082 } |
1083 | 1083 |
1084 if (!prepareForCommit()) | 1084 if (!prepareForCommit()) |
1085 return; | 1085 return; |
1086 | 1086 |
1087 if (isLoadingMainFrame()) | 1087 if (isLoadingMainFrame()) { |
1088 m_frame->page()->chromeClient().needTouchEvents(false); | 1088 m_frame->page()->chromeClient().needTouchEvents(false); |
| 1089 m_frame->page()->chromeClient().needTouchMoveEvents(false); |
| 1090 } |
1089 | 1091 |
1090 client()->transitionToCommittedForNewPage(); | 1092 client()->transitionToCommittedForNewPage(); |
1091 m_frame->navigationScheduler().cancel(); | 1093 m_frame->navigationScheduler().cancel(); |
1092 m_frame->editor().clearLastEditCommand(); | 1094 m_frame->editor().clearLastEditCommand(); |
1093 | 1095 |
1094 // If we are still in the process of initializing an empty document then | 1096 // If we are still in the process of initializing an empty document then |
1095 // its frame is not in a consistent state for rendering, so avoid setJSStatu
sBarText | 1097 // its frame is not in a consistent state for rendering, so avoid setJSStatu
sBarText |
1096 // since it may cause clients to attempt to render the frame. | 1098 // since it may cause clients to attempt to render the frame. |
1097 if (!m_stateMachine.creatingInitialEmptyDocument()) { | 1099 if (!m_stateMachine.creatingInitialEmptyDocument()) { |
1098 DOMWindow* window = m_frame->domWindow(); | 1100 DOMWindow* window = m_frame->domWindow(); |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1516 // FIXME: We need a way to propagate insecure requests policy flags to | 1518 // FIXME: We need a way to propagate insecure requests policy flags to |
1517 // out-of-process frames. For now, we'll always use default behavior. | 1519 // out-of-process frames. For now, we'll always use default behavior. |
1518 if (!parentFrame->isLocalFrame()) | 1520 if (!parentFrame->isLocalFrame()) |
1519 return nullptr; | 1521 return nullptr; |
1520 | 1522 |
1521 ASSERT(toLocalFrame(parentFrame)->document()); | 1523 ASSERT(toLocalFrame(parentFrame)->document()); |
1522 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; | 1524 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade()
; |
1523 } | 1525 } |
1524 | 1526 |
1525 } // namespace blink | 1527 } // namespace blink |
OLD | NEW |