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

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

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reworked as per new comments. Fixed build errors! Created 4 years, 8 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 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 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 if (enableWebBluetooth) 1482 if (enableWebBluetooth)
1483 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1483 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1484 1484
1485 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1485 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1486 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1486 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1487 if (RuntimeEnabledFeatures::presentationEnabled()) 1487 if (RuntimeEnabledFeatures::presentationEnabled())
1488 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1488 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1489 if (RuntimeEnabledFeatures::permissionsEnabled()) 1489 if (RuntimeEnabledFeatures::permissionsEnabled())
1490 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); 1490 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr);
1491 if (RuntimeEnabledFeatures::webVREnabled()) 1491 if (RuntimeEnabledFeatures::webVREnabled())
1492 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : n ullptr); 1492 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr);
1493 if (RuntimeEnabledFeatures::wakeLockEnabled()) 1493 if (RuntimeEnabledFeatures::wakeLockEnabled())
1494 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr); 1494 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr);
1495 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1495 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1496 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1496 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create());
1497 if (RuntimeEnabledFeatures::installedAppEnabled()) 1497 if (RuntimeEnabledFeatures::installedAppEnabled())
1498 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1498 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1499 } 1499 }
1500 1500
1501 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1501 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1502 { 1502 {
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 return WebSandboxFlags::None; 2110 return WebSandboxFlags::None;
2111 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2111 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2112 } 2112 }
2113 2113
2114 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2114 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2115 { 2115 {
2116 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2116 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2117 } 2117 }
2118 2118
2119 } // namespace blink 2119 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698