Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2385123005: Enable WebVR origin trial experiments. (Closed)
Patch Set: Rebase for conflict in ConditionalFeaturesForModules.cpp Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/serviceworkers/NavigatorServiceWorker.h" 62 #include "modules/serviceworkers/NavigatorServiceWorker.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 Document* document = m_webFrame->frame()->document(); 149 Document* document = m_webFrame->frame()->document();
149 if (document) { 150 if (document) {
150 DeviceMotionController::from(*document); 151 DeviceMotionController::from(*document);
151 DeviceOrientationController::from(*document); 152 DeviceOrientationController::from(*document);
152 DeviceOrientationAbsoluteController::from(*document); 153 DeviceOrientationAbsoluteController::from(*document);
153 if (RuntimeEnabledFeatures::deviceLightEnabled()) 154 if (RuntimeEnabledFeatures::deviceLightEnabled())
154 DeviceLightController::from(*document); 155 DeviceLightController::from(*document);
155 NavigatorGamepad::from(*document); 156 NavigatorGamepad::from(*document);
156 NavigatorServiceWorker::from(*document); 157 NavigatorServiceWorker::from(*document);
157 DOMWindowStorageController::from(*document); 158 DOMWindowStorageController::from(*document);
158 if (RuntimeEnabledFeatures::webVREnabled()) 159 if (RuntimeEnabledFeatures::webVREnabled() ||
160 OriginTrials::webVREnabled(document->getExecutionContext()))
159 NavigatorVR::from(*document); 161 NavigatorVR::from(*document);
160 } 162 }
161 } 163 }
162 // FIXME: when extensions go out of process, this whole concept stops working. 164 // FIXME: when extensions go out of process, this whole concept stops working.
163 WebDevToolsFrontendImpl* devToolsFrontend = 165 WebDevToolsFrontendImpl* devToolsFrontend =
164 m_webFrame->top()->isWebLocalFrame() 166 m_webFrame->top()->isWebLocalFrame()
165 ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend() 167 ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend()
166 : nullptr; 168 : nullptr;
167 if (devToolsFrontend) 169 if (devToolsFrontend)
168 devToolsFrontend->didClearWindowObject(m_webFrame); 170 devToolsFrontend->didClearWindowObject(m_webFrame);
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 991 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
990 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 992 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
991 ->devToolsAgentImpl(); 993 ->devToolsAgentImpl();
992 } 994 }
993 995
994 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 996 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
995 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 997 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
996 } 998 }
997 999
998 } // namespace blink 1000 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698