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

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

Issue 2167643003: Refactored VRService interaction and added VRServiceClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Liberal sprinkling of 'u's Created 4 years, 4 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/modules/vr/VRGetDevicesCallback.cpp ('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 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "core/timing/DOMWindowPerformance.h" 153 #include "core/timing/DOMWindowPerformance.h"
154 #include "core/timing/Performance.h" 154 #include "core/timing/Performance.h"
155 #include "modules/app_banner/AppBannerController.h" 155 #include "modules/app_banner/AppBannerController.h"
156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" 156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
157 #include "modules/bluetooth/BluetoothSupplement.h" 157 #include "modules/bluetooth/BluetoothSupplement.h"
158 #include "modules/installedapp/InstalledAppController.h" 158 #include "modules/installedapp/InstalledAppController.h"
159 #include "modules/notifications/NotificationPermissionClient.h" 159 #include "modules/notifications/NotificationPermissionClient.h"
160 #include "modules/presentation/PresentationController.h" 160 #include "modules/presentation/PresentationController.h"
161 #include "modules/push_messaging/PushController.h" 161 #include "modules/push_messaging/PushController.h"
162 #include "modules/screen_orientation/ScreenOrientationController.h" 162 #include "modules/screen_orientation/ScreenOrientationController.h"
163 #include "modules/vr/VRController.h"
164 #include "modules/wake_lock/ScreenWakeLock.h" 163 #include "modules/wake_lock/ScreenWakeLock.h"
165 #include "platform/ScriptForbiddenScope.h" 164 #include "platform/ScriptForbiddenScope.h"
166 #include "platform/TraceEvent.h" 165 #include "platform/TraceEvent.h"
167 #include "platform/UserGestureIndicator.h" 166 #include "platform/UserGestureIndicator.h"
168 #include "platform/clipboard/ClipboardUtilities.h" 167 #include "platform/clipboard/ClipboardUtilities.h"
169 #include "platform/fonts/FontCache.h" 168 #include "platform/fonts/FontCache.h"
170 #include "platform/graphics/GraphicsContext.h" 169 #include "platform/graphics/GraphicsContext.h"
171 #include "platform/graphics/GraphicsLayerClient.h" 170 #include "platform/graphics/GraphicsLayerClient.h"
172 #include "platform/graphics/paint/ClipRecorder.h" 171 #include "platform/graphics/paint/ClipRecorder.h"
173 #include "platform/graphics/paint/DisplayItemCacheSkipper.h" 172 #include "platform/graphics/paint/DisplayItemCacheSkipper.h"
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) 1479 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX)
1481 enableWebBluetooth = true; 1480 enableWebBluetooth = true;
1482 #endif 1481 #endif
1483 if (enableWebBluetooth) 1482 if (enableWebBluetooth)
1484 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1483 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1485 1484
1486 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1485 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1487 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1486 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1488 if (RuntimeEnabledFeatures::presentationEnabled()) 1487 if (RuntimeEnabledFeatures::presentationEnabled())
1489 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1488 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1490 if (RuntimeEnabledFeatures::webVREnabled())
1491 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr);
1492 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1489 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1493 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1490 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create());
1494 if (RuntimeEnabledFeatures::installedAppEnabled()) 1491 if (RuntimeEnabledFeatures::installedAppEnabled())
1495 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1492 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1496 } 1493 }
1497 1494
1498 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1495 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1499 { 1496 {
1500 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr)); 1497 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr));
1501 frame()->tree().setPrecalculatedName(name, uniqueName); 1498 frame()->tree().setPrecalculatedName(name, uniqueName);
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 { 2151 {
2155 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2152 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2156 } 2153 }
2157 2154
2158 void WebLocalFrameImpl::clearActiveFindMatch() 2155 void WebLocalFrameImpl::clearActiveFindMatch()
2159 { 2156 {
2160 ensureTextFinder().clearActiveFindMatch(); 2157 ensureTextFinder().clearActiveFindMatch();
2161 } 2158 }
2162 2159
2163 } // namespace blink 2160 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/vr/VRGetDevicesCallback.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698