| OLD | NEW |
| 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 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1539 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl
ientImpl::create()); | 1539 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl
ientImpl::create()); |
| 1540 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1540 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
| 1541 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); | 1541 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); |
| 1542 m_geolocationClientProxy->setController(GeolocationController::from(m_fr
ame.get())); | 1542 m_geolocationClientProxy->setController(GeolocationController::from(m_fr
ame.get())); |
| 1543 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : nullptr)); | 1543 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web
MIDIClient() : nullptr)); |
| 1544 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1544 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1545 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl
::create(this)); | 1545 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl
::create(this)); |
| 1546 | 1546 |
| 1547 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); | 1547 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); |
| 1548 #if OS(CHROMEOS) || OS(ANDROID) | 1548 #if OS(CHROMEOS) || OS(ANDROID) |
| 1549 enableWebBluetooth = true; | 1549 // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment. |
| 1550 // enableWebBluetooth = true; |
| 1550 #endif | 1551 #endif |
| 1551 | 1552 |
| 1552 if (enableWebBluetooth) { | 1553 if (enableWebBluetooth) { |
| 1553 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->blueto
oth() : nullptr); | 1554 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->blueto
oth() : nullptr); |
| 1554 } | 1555 } |
| 1555 | 1556 |
| 1556 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1557 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 1557 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : nullptr); | 1558 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client
->webScreenOrientationClient() : nullptr); |
| 1558 if (RuntimeEnabledFeatures::presentationEnabled()) | 1559 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1559 PresentationController::provideTo(*m_frame, m_client ? m_client->pre
sentationClient() : nullptr); | 1560 PresentationController::provideTo(*m_frame, m_client ? m_client->pre
sentationClient() : nullptr); |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2197 return WebSandboxFlags::None; | 2198 return WebSandboxFlags::None; |
| 2198 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2199 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2199 } | 2200 } |
| 2200 | 2201 |
| 2201 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2202 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2202 { | 2203 { |
| 2203 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2204 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2204 } | 2205 } |
| 2205 | 2206 |
| 2206 } // namespace blink | 2207 } // namespace blink |
| OLD | NEW |