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

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

Issue 1577263004: Communicate whether passive event listeners exist to cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_passive_listeners
Patch Set: Fix nits Created 4 years, 10 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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 1080
1081 // Check if the destination page is allowed to access the previous page's ti ming information. 1081 // Check if the destination page is allowed to access the previous page's ti ming information.
1082 if (m_frame->document()) { 1082 if (m_frame->document()) {
1083 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi onalDocumentLoader->request().url()); 1083 RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_provisi onalDocumentLoader->request().url());
1084 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument (securityOrigin->canRequest(m_frame->document()->url())); 1084 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument (securityOrigin->canRequest(m_frame->document()->url()));
1085 } 1085 }
1086 1086
1087 if (!prepareForCommit()) 1087 if (!prepareForCommit())
1088 return; 1088 return;
1089 1089
1090 if (isLoadingMainFrame()) 1090 if (isLoadingMainFrame()) {
1091 m_frame->page()->chromeClient().needTouchEvents(false); 1091 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::Touch, WebEventListenerProperties::Nothing);
1092 m_frame->page()->chromeClient().setEventListenerProperties(WebEventListe nerClass::MouseWheel, WebEventListenerProperties::Nothing);
1093 }
1092 1094
1093 client()->transitionToCommittedForNewPage(); 1095 client()->transitionToCommittedForNewPage();
1094 m_frame->navigationScheduler().cancel(); 1096 m_frame->navigationScheduler().cancel();
1095 m_frame->editor().clearLastEditCommand(); 1097 m_frame->editor().clearLastEditCommand();
1096 1098
1097 // If we are still in the process of initializing an empty document then 1099 // If we are still in the process of initializing an empty document then
1098 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText 1100 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText
1099 // since it may cause clients to attempt to render the frame. 1101 // since it may cause clients to attempt to render the frame.
1100 if (!m_stateMachine.creatingInitialEmptyDocument()) { 1102 if (!m_stateMachine.creatingInitialEmptyDocument()) {
1101 DOMWindow* window = m_frame->domWindow(); 1103 DOMWindow* window = m_frame->domWindow();
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 // FIXME: We need a way to propagate insecure requests policy flags to 1552 // FIXME: We need a way to propagate insecure requests policy flags to
1551 // out-of-process frames. For now, we'll always use default behavior. 1553 // out-of-process frames. For now, we'll always use default behavior.
1552 if (!parentFrame->isLocalFrame()) 1554 if (!parentFrame->isLocalFrame())
1553 return nullptr; 1555 return nullptr;
1554 1556
1555 ASSERT(toLocalFrame(parentFrame)->document()); 1557 ASSERT(toLocalFrame(parentFrame)->document());
1556 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1558 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1557 } 1559 }
1558 1560
1559 } // namespace blink 1561 } // 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