diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-03-26 17:51:48 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-10-16 14:33:27 +0000 |
| commit | 3d7a96629b790ee12d9be864e284c14606da649d (patch) | |
| tree | 2fbf76a5678b284e5b82e8a29a7b15112cc1bce1 | |
| parent | 858447a7654404e4c266c147023e1cc30c38b809 (diff) | |
| download | qtwebengine-chromium-3d7a96629b790ee12d9be864e284c14606da649d.tar.gz | |
Convert asserts to logs and returns in the PpapiHost
Since we previously did so for the creation of the resource, we
were still receiving notifications about the destruction of the
resource.
Convert the NOTREACHED() to a LOG for this case. This will allow
us to still play Widevine video on macOS even though resource
creation failed. We still need to investigate what is actually
going wrong with the resource creation, though.
Also, format the LOG command for resource creation to be more
readable.
Task-number: QTBUG-64832
Change-Id: I42a11b8f795626b43f05d692491b81a179c0da9e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/ppapi/host/ppapi_host.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/chromium/ppapi/host/ppapi_host.cc b/chromium/ppapi/host/ppapi_host.cc index 8c1a719b6f4..9dbf484e937 100644 --- a/chromium/ppapi/host/ppapi_host.cc +++ b/chromium/ppapi/host/ppapi_host.cc @@ -241,9 +241,9 @@ void PpapiHost::OnHostMsgResourceCreated( #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()); + LOG(INFO) << "Failed to create PPAPI resource host - " + << "Class: " << IPC_MESSAGE_ID_CLASS(nested_msg.type()) + << "Line: " << IPC_MESSAGE_ID_LINE(nested_msg.type()); #endif return; } @@ -260,7 +260,11 @@ void PpapiHost::OnHostMsgAttachToPendingHost(PP_Resource pp_resource, pending_resource_hosts_.find(pending_host_id); if (found == pending_resource_hosts_.end()) { // Plugin sent a bad ID. +#ifndef TOOLKIT_QT NOTREACHED(); +#else + LOG(INFO) << "Did not find resource host for id: " << pending_host_id; +#endif return; } found->second->SetPPResourceForPendingHost(pp_resource); @@ -271,7 +275,11 @@ void PpapiHost::OnHostMsgAttachToPendingHost(PP_Resource pp_resource, void PpapiHost::OnHostMsgResourceDestroyed(PP_Resource resource) { ResourceMap::iterator found = resources_.find(resource); if (found == resources_.end()) { +#ifndef TOOLKIT_QT NOTREACHED(); +#else + LOG(INFO) << "Failed to find PPAPI resource: " << resource; +#endif return; } // Invoking the HostResource destructor might result in looking up the |