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

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

Issue 1884863003: Non passive touch end or touch cancel listeners should not block scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 } 902 }
903 903
904 bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal(const DialogType & dialogType, const String& dialogMessage, Document::PageDismissalType dismissal Type) const 904 bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal(const DialogType & dialogType, const String& dialogMessage, Document::PageDismissalType dismissal Type) const
905 { 905 {
906 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" + dialogMessage + "') during " + dismissalTypeToString(dismissalType) + "."; 906 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" + dialogMessage + "') during " + dismissalTypeToString(dismissalType) + ".";
907 m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMess age::LevelError, message)); 907 m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMess age::LevelError, message));
908 908
909 return false; 909 return false;
910 } 910 }
911 911
912 void ChromeClientImpl::setHaveTouchEventListeners(bool hasListeners)
913 {
914 m_webView->hasTouchEventHandlers(hasListeners);
915 }
916
912 void ChromeClientImpl::setEventListenerProperties(WebEventListenerClass eventCla ss, WebEventListenerProperties properties) 917 void ChromeClientImpl::setEventListenerProperties(WebEventListenerClass eventCla ss, WebEventListenerProperties properties)
913 { 918 {
914 if (eventClass == WebEventListenerClass::Touch)
915 m_webView->hasTouchEventHandlers(properties != WebEventListenerPropertie s::Nothing);
916
917 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) 919 if (WebLayerTreeView* treeView = m_webView->layerTreeView())
918 treeView->setEventListenerProperties(eventClass, properties); 920 treeView->setEventListenerProperties(eventClass, properties);
919 } 921 }
920 922
921 WebEventListenerProperties ChromeClientImpl::eventListenerProperties(WebEventLis tenerClass eventClass) const 923 WebEventListenerProperties ChromeClientImpl::eventListenerProperties(WebEventLis tenerClass eventClass) const
922 { 924 {
923 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) 925 if (WebLayerTreeView* treeView = m_webView->layerTreeView())
924 return treeView->eventListenerProperties(eventClass); 926 return treeView->eventListenerProperties(eventClass);
925 return WebEventListenerProperties::Nothing; 927 return WebEventListenerProperties::Nothing;
926 } 928 }
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 if (m_webView->pageImportanceSignals()) 1091 if (m_webView->pageImportanceSignals())
1090 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript(); 1092 m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript();
1091 } 1093 }
1092 1094
1093 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler(BlameContex t* blameContext) 1095 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler(BlameContex t* blameContext)
1094 { 1096 {
1095 return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).r elease()); 1097 return adoptPtr(m_webView->scheduler()->createFrameScheduler(blameContext).r elease());
1096 } 1098 }
1097 1099
1098 } // namespace blink 1100 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698