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

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

Issue 848053002: Adding WebVR interface to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed compiler warning treated as an error on Windows Created 5 years, 9 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
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "core/page/Chrome.h" 50 #include "core/page/Chrome.h"
51 #include "core/page/EventHandler.h" 51 #include "core/page/EventHandler.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/device_light/DeviceLightController.h" 54 #include "modules/device_light/DeviceLightController.h"
55 #include "modules/device_orientation/DeviceMotionController.h" 55 #include "modules/device_orientation/DeviceMotionController.h"
56 #include "modules/device_orientation/DeviceOrientationController.h" 56 #include "modules/device_orientation/DeviceOrientationController.h"
57 #include "modules/gamepad/NavigatorGamepad.h" 57 #include "modules/gamepad/NavigatorGamepad.h"
58 #include "modules/serviceworkers/NavigatorServiceWorker.h" 58 #include "modules/serviceworkers/NavigatorServiceWorker.h"
59 #include "modules/storage/DOMWindowStorageController.h" 59 #include "modules/storage/DOMWindowStorageController.h"
60 #include "modules/vr/NavigatorVRDevice.h"
60 #include "platform/MIMETypeRegistry.h" 61 #include "platform/MIMETypeRegistry.h"
61 #include "platform/RuntimeEnabledFeatures.h" 62 #include "platform/RuntimeEnabledFeatures.h"
62 #include "platform/UserGestureIndicator.h" 63 #include "platform/UserGestureIndicator.h"
63 #include "platform/exported/WrappedResourceRequest.h" 64 #include "platform/exported/WrappedResourceRequest.h"
64 #include "platform/exported/WrappedResourceResponse.h" 65 #include "platform/exported/WrappedResourceResponse.h"
65 #include "platform/network/HTTPParsers.h" 66 #include "platform/network/HTTPParsers.h"
66 #include "platform/plugins/PluginData.h" 67 #include "platform/plugins/PluginData.h"
67 #include "public/platform/Platform.h" 68 #include "public/platform/Platform.h"
68 #include "public/platform/WebApplicationCacheHost.h" 69 #include "public/platform/WebApplicationCacheHost.h"
69 #include "public/platform/WebMimeRegistry.h" 70 #include "public/platform/WebMimeRegistry.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 Document* document = m_webFrame->frame()->document(); 126 Document* document = m_webFrame->frame()->document();
126 if (document) { 127 if (document) {
127 DeviceMotionController::from(*document); 128 DeviceMotionController::from(*document);
128 DeviceOrientationController::from(*document); 129 DeviceOrientationController::from(*document);
129 if (RuntimeEnabledFeatures::deviceLightEnabled()) 130 if (RuntimeEnabledFeatures::deviceLightEnabled())
130 DeviceLightController::from(*document); 131 DeviceLightController::from(*document);
131 NavigatorGamepad::from(*document); 132 NavigatorGamepad::from(*document);
132 if (RuntimeEnabledFeatures::serviceWorkerEnabled()) 133 if (RuntimeEnabledFeatures::serviceWorkerEnabled())
133 NavigatorServiceWorker::from(*document); 134 NavigatorServiceWorker::from(*document);
134 DOMWindowStorageController::from(*document); 135 DOMWindowStorageController::from(*document);
136 if (RuntimeEnabledFeatures::vRDeviceEnabled())
137 NavigatorVRDevice::from(*document);
135 } 138 }
136 } 139 }
137 // FIXME: when extensions go out of process, this whole concept stops workin g. 140 // FIXME: when extensions go out of process, this whole concept stops workin g.
138 WebDevToolsFrontendImpl* devToolsFrontend = m_webFrame->top()->isWebLocalFra me() ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend() : nullptr; 141 WebDevToolsFrontendImpl* devToolsFrontend = m_webFrame->top()->isWebLocalFra me() ? toWebLocalFrameImpl(m_webFrame->top())->devToolsFrontend() : nullptr;
139 if (devToolsFrontend) 142 if (devToolsFrontend)
140 devToolsFrontend->didClearWindowObject(m_webFrame); 143 devToolsFrontend->didClearWindowObject(m_webFrame);
141 } 144 }
142 145
143 void FrameLoaderClientImpl::documentElementAvailable() 146 void FrameLoaderClientImpl::documentElementAvailable()
144 { 147 {
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 961
959 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 962 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
960 { 963 {
961 if (m_webFrame->client()) { 964 if (m_webFrame->client()) {
962 m_webFrame->client()->suddenTerminationDisablerChanged( 965 m_webFrame->client()->suddenTerminationDisablerChanged(
963 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 966 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
964 } 967 }
965 } 968 }
966 969
967 } // namespace blink 970 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698