| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "core/input/EventHandler.h" | 46 #include "core/input/EventHandler.h" |
| 47 #include "core/layout/HitTestResult.h" | 47 #include "core/layout/HitTestResult.h" |
| 48 #include "core/loader/DocumentLoader.h" | 48 #include "core/loader/DocumentLoader.h" |
| 49 #include "core/loader/FrameLoadRequest.h" | 49 #include "core/loader/FrameLoadRequest.h" |
| 50 #include "core/loader/FrameLoader.h" | 50 #include "core/loader/FrameLoader.h" |
| 51 #include "core/loader/HistoryItem.h" | 51 #include "core/loader/HistoryItem.h" |
| 52 #include "core/origin_trials/OriginTrials.h" | 52 #include "core/origin_trials/OriginTrials.h" |
| 53 #include "core/page/Page.h" | 53 #include "core/page/Page.h" |
| 54 #include "core/page/WindowFeatures.h" | 54 #include "core/page/WindowFeatures.h" |
| 55 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" | 55 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" |
| 56 #include "modules/device_light/DeviceLightController.h" | |
| 57 #include "modules/device_orientation/DeviceMotionController.h" | 56 #include "modules/device_orientation/DeviceMotionController.h" |
| 58 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" | 57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" |
| 59 #include "modules/device_orientation/DeviceOrientationController.h" | 58 #include "modules/device_orientation/DeviceOrientationController.h" |
| 60 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
| 61 #include "modules/gamepad/NavigatorGamepad.h" | 60 #include "modules/gamepad/NavigatorGamepad.h" |
| 62 #include "modules/remoteplayback/HTMLMediaElementRemotePlayback.h" | 61 #include "modules/remoteplayback/HTMLMediaElementRemotePlayback.h" |
| 63 #include "modules/remoteplayback/RemotePlayback.h" | 62 #include "modules/remoteplayback/RemotePlayback.h" |
| 64 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 63 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
| 65 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" | 64 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" |
| 66 #include "modules/storage/DOMWindowStorageController.h" | 65 #include "modules/storage/DOMWindowStorageController.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 144 } |
| 146 | 145 |
| 147 void LocalFrameClientImpl::dispatchDidClearWindowObjectInMainWorld() { | 146 void LocalFrameClientImpl::dispatchDidClearWindowObjectInMainWorld() { |
| 148 if (m_webFrame->client()) { | 147 if (m_webFrame->client()) { |
| 149 m_webFrame->client()->didClearWindowObject(m_webFrame); | 148 m_webFrame->client()->didClearWindowObject(m_webFrame); |
| 150 Document* document = m_webFrame->frame()->document(); | 149 Document* document = m_webFrame->frame()->document(); |
| 151 if (document) { | 150 if (document) { |
| 152 DeviceMotionController::from(*document); | 151 DeviceMotionController::from(*document); |
| 153 DeviceOrientationController::from(*document); | 152 DeviceOrientationController::from(*document); |
| 154 DeviceOrientationAbsoluteController::from(*document); | 153 DeviceOrientationAbsoluteController::from(*document); |
| 155 if (RuntimeEnabledFeatures::deviceLightEnabled()) | |
| 156 DeviceLightController::from(*document); | |
| 157 NavigatorGamepad::from(*document); | 154 NavigatorGamepad::from(*document); |
| 158 NavigatorServiceWorker::from(*document); | 155 NavigatorServiceWorker::from(*document); |
| 159 DOMWindowStorageController::from(*document); | 156 DOMWindowStorageController::from(*document); |
| 160 if (RuntimeEnabledFeatures::webVREnabled() || | 157 if (RuntimeEnabledFeatures::webVREnabled() || |
| 161 OriginTrials::webVREnabled(document->getExecutionContext())) | 158 OriginTrials::webVREnabled(document->getExecutionContext())) |
| 162 NavigatorVR::from(*document); | 159 NavigatorVR::from(*document); |
| 163 } | 160 } |
| 164 } | 161 } |
| 165 // FIXME: when extensions go out of process, this whole concept stops working. | 162 // FIXME: when extensions go out of process, this whole concept stops working. |
| 166 WebDevToolsFrontendImpl* devToolsFrontend = | 163 WebDevToolsFrontendImpl* devToolsFrontend = |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 if (m_webFrame->client()) | 1027 if (m_webFrame->client()) |
| 1031 m_webFrame->client()->setHasReceivedUserGesture(); | 1028 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1032 } | 1029 } |
| 1033 | 1030 |
| 1034 void LocalFrameClientImpl::abortClientNavigation() { | 1031 void LocalFrameClientImpl::abortClientNavigation() { |
| 1035 if (m_webFrame->client()) | 1032 if (m_webFrame->client()) |
| 1036 m_webFrame->client()->abortClientNavigation(); | 1033 m_webFrame->client()->abortClientNavigation(); |
| 1037 } | 1034 } |
| 1038 | 1035 |
| 1039 } // namespace blink | 1036 } // namespace blink |
| OLD | NEW |