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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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/page/Page.h" | 52 #include "core/page/Page.h" |
53 #include "core/page/WindowFeatures.h" | 53 #include "core/page/WindowFeatures.h" |
54 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" | 54 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" |
55 #include "modules/device_light/DeviceLightController.h" | 55 #include "modules/device_light/DeviceLightController.h" |
56 #include "modules/device_orientation/DeviceMotionController.h" | 56 #include "modules/device_orientation/DeviceMotionController.h" |
57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" | |
57 #include "modules/device_orientation/DeviceOrientationController.h" | 58 #include "modules/device_orientation/DeviceOrientationController.h" |
58 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
59 #include "modules/gamepad/NavigatorGamepad.h" | 60 #include "modules/gamepad/NavigatorGamepad.h" |
60 #include "modules/mediasession/MediaSession.h" | 61 #include "modules/mediasession/MediaSession.h" |
61 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 62 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
62 #include "modules/storage/DOMWindowStorageController.h" | 63 #include "modules/storage/DOMWindowStorageController.h" |
63 #include "modules/vr/NavigatorVRDevice.h" | 64 #include "modules/vr/NavigatorVRDevice.h" |
64 #include "platform/MIMETypeRegistry.h" | 65 #include "platform/MIMETypeRegistry.h" |
65 #include "platform/RuntimeEnabledFeatures.h" | 66 #include "platform/RuntimeEnabledFeatures.h" |
66 #include "platform/UserGestureIndicator.h" | 67 #include "platform/UserGestureIndicator.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
132 } | 133 } |
133 | 134 |
134 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInMainWorld() | 135 void FrameLoaderClientImpl::dispatchDidClearWindowObjectInMainWorld() |
135 { | 136 { |
136 if (m_webFrame->client()) { | 137 if (m_webFrame->client()) { |
137 m_webFrame->client()->didClearWindowObject(m_webFrame); | 138 m_webFrame->client()->didClearWindowObject(m_webFrame); |
138 Document* document = m_webFrame->frame()->document(); | 139 Document* document = m_webFrame->frame()->document(); |
139 if (document) { | 140 if (document) { |
140 DeviceMotionController::from(*document); | 141 DeviceMotionController::from(*document); |
141 DeviceOrientationController::from(*document); | 142 DeviceOrientationController::from(*document); |
143 if (RuntimeEnabledFeatures::deviceOrientationAbsoluteEnabled()) | |
144 DeviceOrientationAbsoluteController::from(*document); | |
haraken
2015/10/29 14:15:11
If the runtime flag is enabled, won't it happen th
timvolodine
2015/10/29 19:34:33
If understand correctly the point about supplement
| |
142 if (RuntimeEnabledFeatures::deviceLightEnabled()) | 145 if (RuntimeEnabledFeatures::deviceLightEnabled()) |
143 DeviceLightController::from(*document); | 146 DeviceLightController::from(*document); |
144 NavigatorGamepad::from(*document); | 147 NavigatorGamepad::from(*document); |
145 NavigatorServiceWorker::from(*document); | 148 NavigatorServiceWorker::from(*document); |
146 DOMWindowStorageController::from(*document); | 149 DOMWindowStorageController::from(*document); |
147 if (RuntimeEnabledFeatures::webVREnabled()) | 150 if (RuntimeEnabledFeatures::webVREnabled()) |
148 NavigatorVRDevice::from(*document); | 151 NavigatorVRDevice::from(*document); |
149 } | 152 } |
150 } | 153 } |
151 // FIXME: when extensions go out of process, this whole concept stops workin g. | 154 // FIXME: when extensions go out of process, this whole concept stops workin g. |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
966 | 969 |
967 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) | 970 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) |
968 { | 971 { |
969 if (m_webFrame->client()) { | 972 if (m_webFrame->client()) { |
970 m_webFrame->client()->suddenTerminationDisablerChanged( | 973 m_webFrame->client()->suddenTerminationDisablerChanged( |
971 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); | 974 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); |
972 } | 975 } |
973 } | 976 } |
974 | 977 |
975 } // namespace blink | 978 } // namespace blink |
OLD | NEW |