Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 1895303007: Non passive touch end or touch cancel listeners should not block scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 // Check if the destination page is allowed to access the previous page's ti ming information. 1102 // Check if the destination page is allowed to access the previous page's ti ming information.
1103 if (m_frame->document()) { 1103 if (m_frame->document()) {
1104 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi onalDocumentLoader->request().url()); 1104 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi onalDocumentLoader->request().url());
1105 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument (securityOrigin->canRequest(m_frame->document()->url())); 1105 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument (securityOrigin->canRequest(m_frame->document()->url()));
1106 } 1106 }
1107 1107
1108 if (!prepareForCommit()) 1108 if (!prepareForCommit())
1109 return; 1109 return;
1110 1110
1111 if (isLoadingMainFrame()) { 1111 if (isLoadingMainFrame()) {
1112 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::Touch, WebEventListenerProperties::Nothing); 1112 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::TouchStartOrMove, WebEventListenerProperties::Nothing);
1113 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::MouseWheel, WebEventListenerProperties::Nothing); 1113 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::MouseWheel, WebEventListenerProperties::Nothing);
1114 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::TouchEndOrCancel, WebEventListenerProperties::Nothing);
1114 } 1115 }
1115 1116
1116 client()->transitionToCommittedForNewPage(); 1117 client()->transitionToCommittedForNewPage();
1117 m_frame->navigationScheduler().cancel(); 1118 m_frame->navigationScheduler().cancel();
1118 m_frame->editor().clearLastEditCommand(); 1119 m_frame->editor().clearLastEditCommand();
1119 1120
1120 // If we are still in the process of initializing an empty document then 1121 // If we are still in the process of initializing an empty document then
1121 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText 1122 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText
1122 // since it may cause clients to attempt to render the frame. 1123 // since it may cause clients to attempt to render the frame.
1123 if (!m_stateMachine.creatingInitialEmptyDocument()) { 1124 if (!m_stateMachine.creatingInitialEmptyDocument()) {
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 // FIXME: We need a way to propagate insecure requests policy flags to 1564 // FIXME: We need a way to propagate insecure requests policy flags to
1564 // out-of-process frames. For now, we'll always use default behavior. 1565 // out-of-process frames. For now, we'll always use default behavior.
1565 if (!parentFrame->isLocalFrame()) 1566 if (!parentFrame->isLocalFrame())
1566 return nullptr; 1567 return nullptr;
1567 1568
1568 ASSERT(toLocalFrame(parentFrame)->document()); 1569 ASSERT(toLocalFrame(parentFrame)->document());
1569 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1570 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1570 } 1571 }
1571 1572
1572 } // namespace blink 1573 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.h ('k') | third_party/WebKit/Source/core/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698