| Index: third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| index f28521197e3537525b78dc6acf7cb4b530d1fb58..17c5196c58af0da104f2b2db6c66d934216c04b5 100644
|
| --- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| @@ -1131,9 +1131,11 @@
|
| {
|
| WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(&frame);
|
| WebFrameClient* client = webFrame->client();
|
| - DCHECK(client);
|
| - providePushControllerTo(frame, client->pushClient());
|
| - provideUserMediaTo(frame, UserMediaClientImpl::create(client->userMediaClient()));
|
| + if (client) {
|
| + providePushControllerTo(frame, client->pushClient());
|
| + provideUserMediaTo(frame, UserMediaClientImpl::create(client->userMediaClient()));
|
| + }
|
| +
|
| provideIndexedDBClientTo(frame, IndexedDBClientImpl::create());
|
| provideLocalFileSystemTo(frame, LocalFileSystemClient::create());
|
| provideNavigatorContentUtilsTo(frame, NavigatorContentUtilsClientImpl::create(webFrame));
|
| @@ -1143,15 +1145,15 @@
|
| enableWebBluetooth = true;
|
| #endif
|
| if (enableWebBluetooth)
|
| - BluetoothSupplement::provideTo(frame, client->bluetooth());
|
| -
|
| - ScreenOrientationController::provideTo(frame, client->webScreenOrientationClient());
|
| + BluetoothSupplement::provideTo(frame, client ? client->bluetooth() : nullptr);
|
| +
|
| + ScreenOrientationController::provideTo(frame, client ? client->webScreenOrientationClient() : nullptr);
|
| if (RuntimeEnabledFeatures::presentationEnabled())
|
| - PresentationController::provideTo(frame, client->presentationClient());
|
| + PresentationController::provideTo(frame, client ? client->presentationClient() : nullptr);
|
| if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
|
| provideAudioOutputDeviceClientTo(frame, AudioOutputDeviceClientImpl::create());
|
| if (RuntimeEnabledFeatures::installedAppEnabled())
|
| - InstalledAppController::provideTo(frame, client->installedAppClient());
|
| + InstalledAppController::provideTo(frame, client ? client->installedAppClient() : nullptr);
|
| }
|
|
|
| } // namespace blink
|
|
|