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 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1466 if (m_client) | 1466 if (m_client) |
1467 providePushControllerTo(*m_frame, m_client->pushClient()); | 1467 providePushControllerTo(*m_frame, m_client->pushClient()); |
1468 | 1468 |
1469 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient
Impl::create()); | 1469 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient
Impl::create()); |
1470 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1470 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
1471 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI
Client() : nullptr)); | 1471 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI
Client() : nullptr)); |
1472 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); | 1472 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); |
1473 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1473 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
1474 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr
eate(this)); | 1474 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr
eate(this)); |
1475 | 1475 |
1476 if (RuntimeEnabledFeatures::webBluetoothEnabled()) | 1476 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); |
| 1477 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) |
| 1478 enableWebBluetooth = true; |
| 1479 #endif |
| 1480 if (enableWebBluetooth) |
1477 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth(
) : nullptr); | 1481 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth(
) : nullptr); |
| 1482 |
1478 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1483 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
1479 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we
bScreenOrientationClient() : nullptr); | 1484 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we
bScreenOrientationClient() : nullptr); |
1480 if (RuntimeEnabledFeatures::presentationEnabled()) | 1485 if (RuntimeEnabledFeatures::presentationEnabled()) |
1481 PresentationController::provideTo(*m_frame, m_client ? m_client->present
ationClient() : nullptr); | 1486 PresentationController::provideTo(*m_frame, m_client ? m_client->present
ationClient() : nullptr); |
1482 if (RuntimeEnabledFeatures::permissionsEnabled()) | 1487 if (RuntimeEnabledFeatures::permissionsEnabled()) |
1483 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio
nClient() : nullptr); | 1488 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio
nClient() : nullptr); |
1484 if (RuntimeEnabledFeatures::webVREnabled()) | 1489 if (RuntimeEnabledFeatures::webVREnabled()) |
1485 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry()
: nullptr); | 1490 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry()
: nullptr); |
1486 if (RuntimeEnabledFeatures::wakeLockEnabled()) | 1491 if (RuntimeEnabledFeatures::wakeLockEnabled()) |
1487 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry
(): nullptr); | 1492 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry
(): nullptr); |
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2156 { | 2161 { |
2157 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2162 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
2158 } | 2163 } |
2159 | 2164 |
2160 void WebLocalFrameImpl::clearActiveFindMatch() | 2165 void WebLocalFrameImpl::clearActiveFindMatch() |
2161 { | 2166 { |
2162 ensureTextFinder().clearActiveFindMatch(); | 2167 ensureTextFinder().clearActiveFindMatch(); |
2163 } | 2168 } |
2164 | 2169 |
2165 } // namespace blink | 2170 } // namespace blink |
OLD | NEW |