diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-15 15:42:49 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 17:04:13 +0100 |
| commit | 967d1ad416bc8a886043a137ea4b0cfc74cbb533 (patch) | |
| tree | 1625f0077ef15353c0a5a500ae84dc0afa50601b | |
| parent | 2aef28bd31f4711f2ab68c5fae222d2a2a5c6a2f (diff) | |
| download | qtwebengine-chromium-967d1ad416bc8a886043a137ea4b0cfc74cbb533.tar.gz | |
Do not assert on PPAPI resources we do not support.
Change-Id: I54b6571549d3c646e359df8ecda85af27f2ea7e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | chromium/ppapi/host/ppapi_host.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/ppapi/host/ppapi_host.cc b/chromium/ppapi/host/ppapi_host.cc index f3c68fab3de..ca0f1e5a276 100644 --- a/chromium/ppapi/host/ppapi_host.cc +++ b/chromium/ppapi/host/ppapi_host.cc @@ -240,7 +240,13 @@ void PpapiHost::OnHostMsgResourceCreated( CreateResourceHost(params.pp_resource(), instance, nested_msg); if (!resource_host.get()) { +#ifndef TOOLKIT_QT NOTREACHED(); +#else + LOG(INFO) << "Failed to create PPAPI resource host" + << IPC_MESSAGE_ID_CLASS(nested_msg.type()) + << IPC_MESSAGE_ID_LINE(nested_msg.type()); +#endif return; } |