OLD | NEW |
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 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
976 properties != WebEventListenerProperties::Nothing || | 976 properties != WebEventListenerProperties::Nothing || |
977 treeView->eventListenerProperties( | 977 treeView->eventListenerProperties( |
978 WebEventListenerClass::TouchStartOrMove) != | 978 WebEventListenerClass::TouchStartOrMove) != |
979 WebEventListenerProperties::Nothing); | 979 WebEventListenerProperties::Nothing); |
980 } | 980 } |
981 } else { | 981 } else { |
982 client->hasTouchEventHandlers(true); | 982 client->hasTouchEventHandlers(true); |
983 } | 983 } |
984 } | 984 } |
985 | 985 |
986 void ChromeClientImpl::updateTouchRectsForSubframeIfNecessary( | 986 void ChromeClientImpl::updateEventRectsForSubframeIfNecessary( |
987 LocalFrame* frame) { | 987 LocalFrame* frame) { |
988 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame); | 988 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame); |
989 WebFrameWidgetBase* widget = webFrame->localRoot()->frameWidget(); | 989 WebFrameWidgetBase* widget = webFrame->localRoot()->frameWidget(); |
990 if (WebLayerTreeView* treeView = widget->getLayerTreeView()) | 990 if (WebLayerTreeView* treeView = widget->getLayerTreeView()) |
991 treeView->updateTouchRectsForSubframeIfNecessary(); | 991 treeView->updateEventRectsForSubframeIfNecessary(); |
992 } | 992 } |
993 | 993 |
994 void ChromeClientImpl::beginLifecycleUpdates() { | 994 void ChromeClientImpl::beginLifecycleUpdates() { |
995 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) { | 995 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) { |
996 treeView->setDeferCommits(false); | 996 treeView->setDeferCommits(false); |
997 treeView->setNeedsBeginFrame(); | 997 treeView->setNeedsBeginFrame(); |
998 } | 998 } |
999 } | 999 } |
1000 | 1000 |
1001 WebEventListenerProperties ChromeClientImpl::eventListenerProperties( | 1001 WebEventListenerProperties ChromeClientImpl::eventListenerProperties( |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1221 PresentationController::provideTo(frame, client->presentationClient()); | 1221 PresentationController::provideTo(frame, client->presentationClient()); |
1222 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1222 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
1223 provideAudioOutputDeviceClientTo(frame, | 1223 provideAudioOutputDeviceClientTo(frame, |
1224 new AudioOutputDeviceClientImpl(frame)); | 1224 new AudioOutputDeviceClientImpl(frame)); |
1225 } | 1225 } |
1226 if (RuntimeEnabledFeatures::installedAppEnabled()) | 1226 if (RuntimeEnabledFeatures::installedAppEnabled()) |
1227 InstalledAppController::provideTo(frame, client->relatedAppsFetcher()); | 1227 InstalledAppController::provideTo(frame, client->relatedAppsFetcher()); |
1228 } | 1228 } |
1229 | 1229 |
1230 } // namespace blink | 1230 } // namespace blink |
OLD | NEW |