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

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

Issue 1799253002: Stricter user gestures for touch - measure and warn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaks 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 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 policy = client()->decidePolicyForNavigation(request, loader, type, policy, replacesCurrentHistoryItem, isClientRedirect); 1348 policy = client()->decidePolicyForNavigation(request, loader, type, policy, replacesCurrentHistoryItem, isClientRedirect);
1349 if (policy == NavigationPolicyCurrentTab) 1349 if (policy == NavigationPolicyCurrentTab)
1350 return true; 1350 return true;
1351 if (policy == NavigationPolicyIgnore) 1351 if (policy == NavigationPolicyIgnore)
1352 return false; 1352 return false;
1353 if (policy == NavigationPolicyHandledByClient) { 1353 if (policy == NavigationPolicyHandledByClient) {
1354 // Mark the frame as loading since the embedder is handling the navigati on. 1354 // Mark the frame as loading since the embedder is handling the navigati on.
1355 m_progressTracker->progressStarted(); 1355 m_progressTracker->progressStarted();
1356 return false; 1356 return false;
1357 } 1357 }
1358 if (!LocalDOMWindow::allowPopUp(*m_frame) && !UserGestureIndicator::processi ngUserGesture()) 1358 if (!LocalDOMWindow::allowPopUp(*m_frame) && !UserGestureIndicator::utilizeU serGesture())
1359 return false; 1359 return false;
1360 client()->loadURLExternally(request, policy, String(), replacesCurrentHistor yItem); 1360 client()->loadURLExternally(request, policy, String(), replacesCurrentHistor yItem);
1361 return false; 1361 return false;
1362 } 1362 }
1363 1363
1364 void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty pe, NavigationPolicy navigationPolicy) 1364 void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty pe, NavigationPolicy navigationPolicy)
1365 { 1365 {
1366 ASSERT(client()->hasWebView()); 1366 ASSERT(client()->hasWebView());
1367 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal) 1367 if (m_frame->document()->pageDismissalEventBeingDispatched() != Document::No Dismissal)
1368 return; 1368 return;
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 // FIXME: We need a way to propagate insecure requests policy flags to 1563 // 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. 1564 // out-of-process frames. For now, we'll always use default behavior.
1565 if (!parentFrame->isLocalFrame()) 1565 if (!parentFrame->isLocalFrame())
1566 return nullptr; 1566 return nullptr;
1567 1567
1568 ASSERT(toLocalFrame(parentFrame)->document()); 1568 ASSERT(toLocalFrame(parentFrame)->document());
1569 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1569 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1570 } 1570 }
1571 1571
1572 } // namespace blink 1572 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.cpp ('k') | third_party/WebKit/Source/core/loader/NavigationScheduler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698