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

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

Issue 2626133002: Candidate fix for PointerEvent-OOPIF combination not working. (Closed)
Patch Set: Undo whitespace change to render_widget.cc Created 3 years, 11 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 955 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) 966 if (WebLayerTreeView* treeView = m_webView->layerTreeView())
967 treeView->setHaveScrollEventHandlers(hasEventHandlers); 967 treeView->setHaveScrollEventHandlers(hasEventHandlers);
968 } 968 }
969 969
970 bool ChromeClientImpl::hasScrollEventHandlers() const { 970 bool ChromeClientImpl::hasScrollEventHandlers() const {
971 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) 971 if (WebLayerTreeView* treeView = m_webView->layerTreeView())
972 return treeView->haveScrollEventHandlers(); 972 return treeView->haveScrollEventHandlers();
973 return false; 973 return false;
974 } 974 }
975 975
976 void ChromeClientImpl::setTouchAction(TouchAction touchAction) { 976 void ChromeClientImpl::setTouchAction(LocalFrame* frame,
977 if (WebViewClient* client = m_webView->client()) 977 TouchAction touchAction) {
978 DCHECK(frame);
979 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
980 WebFrameWidgetBase* widget = webFrame->localRoot()->frameWidget();
981 if (!widget)
982 return;
983
984 if (WebWidgetClient* client = widget->client())
978 client->setTouchAction(static_cast<WebTouchAction>(touchAction)); 985 client->setTouchAction(static_cast<WebTouchAction>(touchAction));
979 } 986 }
980 987
981 bool ChromeClientImpl::requestPointerLock(LocalFrame* frame) { 988 bool ChromeClientImpl::requestPointerLock(LocalFrame* frame) {
982 LocalFrame* localRoot = frame->localFrameRoot(); 989 LocalFrame* localRoot = frame->localFrameRoot();
983 return WebLocalFrameImpl::fromFrame(localRoot) 990 return WebLocalFrameImpl::fromFrame(localRoot)
984 ->frameWidget() 991 ->frameWidget()
985 ->client() 992 ->client()
986 ->requestPointerLock(); 993 ->requestPointerLock();
987 } 994 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 PresentationController::provideTo(frame, client->presentationClient()); 1164 PresentationController::provideTo(frame, client->presentationClient());
1158 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { 1165 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) {
1159 provideAudioOutputDeviceClientTo(frame, 1166 provideAudioOutputDeviceClientTo(frame,
1160 new AudioOutputDeviceClientImpl(frame)); 1167 new AudioOutputDeviceClientImpl(frame));
1161 } 1168 }
1162 if (RuntimeEnabledFeatures::installedAppEnabled()) 1169 if (RuntimeEnabledFeatures::installedAppEnabled())
1163 InstalledAppController::provideTo(frame, client->installedAppClient()); 1170 InstalledAppController::provideTo(frame, client->installedAppClient());
1164 } 1171 }
1165 1172
1166 } // namespace blink 1173 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.h ('k') | third_party/WebKit/Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698