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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "core/frame/Settings.h" | 42 #include "core/frame/Settings.h" |
43 #include "core/html/HTMLFrameElementBase.h" | 43 #include "core/html/HTMLFrameElementBase.h" |
44 #include "core/html/HTMLMediaElement.h" | 44 #include "core/html/HTMLMediaElement.h" |
45 #include "core/html/HTMLPlugInElement.h" | 45 #include "core/html/HTMLPlugInElement.h" |
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/page/Page.h" | 53 #include "core/page/Page.h" |
53 #include "core/page/WindowFeatures.h" | 54 #include "core/page/WindowFeatures.h" |
54 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" | 55 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" |
55 #include "modules/device_light/DeviceLightController.h" | 56 #include "modules/device_light/DeviceLightController.h" |
56 #include "modules/device_orientation/DeviceMotionController.h" | 57 #include "modules/device_orientation/DeviceMotionController.h" |
57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" | 58 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" |
58 #include "modules/device_orientation/DeviceOrientationController.h" | 59 #include "modules/device_orientation/DeviceOrientationController.h" |
59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | 60 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
60 #include "modules/gamepad/NavigatorGamepad.h" | 61 #include "modules/gamepad/NavigatorGamepad.h" |
61 #include "modules/mediasession/MediaSession.h" | 62 #include "modules/mediasession/MediaSession.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 Document* document = m_webFrame->frame()->document(); | 151 Document* document = m_webFrame->frame()->document(); |
151 if (document) { | 152 if (document) { |
152 DeviceMotionController::from(*document); | 153 DeviceMotionController::from(*document); |
153 DeviceOrientationController::from(*document); | 154 DeviceOrientationController::from(*document); |
154 DeviceOrientationAbsoluteController::from(*document); | 155 DeviceOrientationAbsoluteController::from(*document); |
155 if (RuntimeEnabledFeatures::deviceLightEnabled()) | 156 if (RuntimeEnabledFeatures::deviceLightEnabled()) |
156 DeviceLightController::from(*document); | 157 DeviceLightController::from(*document); |
157 NavigatorGamepad::from(*document); | 158 NavigatorGamepad::from(*document); |
158 NavigatorServiceWorker::from(*document); | 159 NavigatorServiceWorker::from(*document); |
159 DOMWindowStorageController::from(*document); | 160 DOMWindowStorageController::from(*document); |
160 if (RuntimeEnabledFeatures::webVREnabled()) | 161 if (RuntimeEnabledFeatures::webVREnabled() |
| 162 || OriginTrials::webVREnabled(document->getExecutionContext())) |
161 NavigatorVR::from(*document); | 163 NavigatorVR::from(*document); |
162 } | 164 } |
163 } | 165 } |
164 // FIXME: when extensions go out of process, this whole concept stops working. | 166 // FIXME: when extensions go out of process, this whole concept stops working. |
165 WebDevToolsFrontendImpl* devToolsFrontend = | 167 WebDevToolsFrontendImpl* devToolsFrontend = |
166 m_webFrame->top()->isWebLocalFrame() | 168 m_webFrame->top()->isWebLocalFrame() |
167 ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend() | 169 ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend() |
168 : nullptr; | 170 : nullptr; |
169 if (devToolsFrontend) | 171 if (devToolsFrontend) |
170 devToolsFrontend->didClearWindowObject(m_webFrame); | 172 devToolsFrontend->didClearWindowObject(m_webFrame); |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
999 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { | 1001 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { |
1000 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) | 1002 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) |
1001 ->devToolsAgentImpl(); | 1003 ->devToolsAgentImpl(); |
1002 } | 1004 } |
1003 | 1005 |
1004 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1006 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
1005 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1007 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
1006 } | 1008 } |
1007 | 1009 |
1008 } // namespace blink | 1010 } // namespace blink |
OLD | NEW |