diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/ppapi/cpp/websocket.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/ppapi/cpp/websocket.cc')
| -rw-r--r-- | chromium/ppapi/cpp/websocket.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chromium/ppapi/cpp/websocket.cc b/chromium/ppapi/cpp/websocket.cc index f0ae5fa0c30..afd1310f072 100644 --- a/chromium/ppapi/cpp/websocket.cc +++ b/chromium/ppapi/cpp/websocket.cc @@ -39,11 +39,8 @@ int32_t WebSocket::Connect(const Var& url, const Var protocols[], // Convert protocols to C interface. PP_Var *c_protocols = NULL; - if (protocol_count) { + if (protocol_count) c_protocols = new PP_Var[protocol_count]; - if (!c_protocols) - return PP_ERROR_NOMEMORY; - } for (uint32_t i = 0; i < protocol_count; ++i) c_protocols[i] = protocols[i].pp_var(); |