| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "core/frame/VisualViewport.h" | 44 #include "core/frame/VisualViewport.h" |
| 45 #include "core/html/HTMLInputElement.h" | 45 #include "core/html/HTMLInputElement.h" |
| 46 #include "core/html/forms/ColorChooser.h" | 46 #include "core/html/forms/ColorChooser.h" |
| 47 #include "core/html/forms/ColorChooserClient.h" | 47 #include "core/html/forms/ColorChooserClient.h" |
| 48 #include "core/html/forms/DateTimeChooser.h" | 48 #include "core/html/forms/DateTimeChooser.h" |
| 49 #include "core/layout/HitTestResult.h" | 49 #include "core/layout/HitTestResult.h" |
| 50 #include "core/layout/LayoutPart.h" | 50 #include "core/layout/LayoutPart.h" |
| 51 #include "core/layout/compositing/CompositedSelection.h" | 51 #include "core/layout/compositing/CompositedSelection.h" |
| 52 #include "core/loader/DocumentLoader.h" | 52 #include "core/loader/DocumentLoader.h" |
| 53 #include "core/loader/FrameLoadRequest.h" | 53 #include "core/loader/FrameLoadRequest.h" |
| 54 #include "core/page/ChromeClient.h" |
| 54 #include "core/page/Page.h" | 55 #include "core/page/Page.h" |
| 55 #include "core/page/PopupOpeningObserver.h" | 56 #include "core/page/PopupOpeningObserver.h" |
| 56 #include "modules/accessibility/AXObject.h" | 57 #include "modules/accessibility/AXObject.h" |
| 57 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" | 58 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" |
| 58 #include "modules/installedapp/InstalledAppController.h" | 59 #include "modules/installedapp/InstalledAppController.h" |
| 59 #include "modules/mediastream/UserMediaController.h" | 60 #include "modules/mediastream/UserMediaController.h" |
| 60 #include "modules/navigatorcontentutils/NavigatorContentUtils.h" | 61 #include "modules/navigatorcontentutils/NavigatorContentUtils.h" |
| 61 #include "modules/presentation/PresentationController.h" | 62 #include "modules/presentation/PresentationController.h" |
| 62 #include "modules/push_messaging/PushController.h" | 63 #include "modules/push_messaging/PushController.h" |
| 63 #include "modules/screen_orientation/ScreenOrientationControllerImpl.h" | 64 #include "modules/screen_orientation/ScreenOrientationControllerImpl.h" |
| (...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 Document::PageDismissalType dismissalType) const { | 922 Document::PageDismissalType dismissalType) const { |
| 922 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" + | 923 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" + |
| 923 dialogMessage + "') during " + | 924 dialogMessage + "') during " + |
| 924 dismissalTypeToString(dismissalType) + "."; | 925 dismissalTypeToString(dismissalType) + "."; |
| 925 WebLocalFrameImpl::fromFrame(frame)->addMessageToConsole( | 926 WebLocalFrameImpl::fromFrame(frame)->addMessageToConsole( |
| 926 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 927 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
| 927 | 928 |
| 928 return false; | 929 return false; |
| 929 } | 930 } |
| 930 | 931 |
| 932 WebLayerTreeView* ChromeClientImpl::getWebLayerTreeView() { |
| 933 return m_webView->layerTreeView(); |
| 934 } |
| 935 |
| 931 void ChromeClientImpl::setEventListenerProperties( | 936 void ChromeClientImpl::setEventListenerProperties( |
| 932 WebEventListenerClass eventClass, | 937 WebEventListenerClass eventClass, |
| 933 WebEventListenerProperties properties) { | 938 WebEventListenerProperties properties) { |
| 934 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) { | 939 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) { |
| 935 treeView->setEventListenerProperties(eventClass, properties); | 940 treeView->setEventListenerProperties(eventClass, properties); |
| 936 if (eventClass == WebEventListenerClass::TouchStartOrMove) { | 941 if (eventClass == WebEventListenerClass::TouchStartOrMove) { |
| 937 m_webView->hasTouchEventHandlers( | 942 m_webView->hasTouchEventHandlers( |
| 938 properties != WebEventListenerProperties::Nothing || | 943 properties != WebEventListenerProperties::Nothing || |
| 939 eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) != | 944 eventListenerProperties(WebEventListenerClass::TouchEndOrCancel) != |
| 940 WebEventListenerProperties::Nothing); | 945 WebEventListenerProperties::Nothing); |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 PresentationController::provideTo(frame, client->presentationClient()); | 1171 PresentationController::provideTo(frame, client->presentationClient()); |
| 1167 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { | 1172 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { |
| 1168 provideAudioOutputDeviceClientTo(frame, | 1173 provideAudioOutputDeviceClientTo(frame, |
| 1169 new AudioOutputDeviceClientImpl(frame)); | 1174 new AudioOutputDeviceClientImpl(frame)); |
| 1170 } | 1175 } |
| 1171 if (RuntimeEnabledFeatures::installedAppEnabled()) | 1176 if (RuntimeEnabledFeatures::installedAppEnabled()) |
| 1172 InstalledAppController::provideTo(frame, client->installedAppClient()); | 1177 InstalledAppController::provideTo(frame, client->installedAppClient()); |
| 1173 } | 1178 } |
| 1174 | 1179 |
| 1175 } // namespace blink | 1180 } // namespace blink |
| OLD | NEW |