diff options
| author | kwiberg <kwiberg@chromium.org> | 2015-04-30 11:57:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 18:57:36 +0000 |
| commit | 100badda5d6d4b5e5c76ce5c57cc750825e87d19 (patch) | |
| tree | 6ea1ac9dfe757d755114c3afc8dae7c48cf826e0 | |
| parent | 830b0c5dda907f2560ab003e588172c43768293a (diff) | |
| download | chromium_src-100badda5d6d4b5e5c76ce5c57cc750825e87d19.zip chromium_src-100badda5d6d4b5e5c76ce5c57cc750825e87d19.tar.gz chromium_src-100badda5d6d4b5e5c76ce5c57cc750825e87d19.tar.bz2 | |
Don't pass void* to rtc::Buffer
It'll soon stop accepting void*; use uint8_t* instead.
Review URL: https://codereview.chromium.org/1117983002
Cr-Commit-Position: refs/heads/master@{#327752}
| -rw-r--r-- | components/devtools_bridge/session_dependency_factory.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/devtools_bridge/session_dependency_factory.cc b/components/devtools_bridge/session_dependency_factory.cc index 567771f..2efa641 100644 --- a/components/devtools_bridge/session_dependency_factory.cc +++ b/components/devtools_bridge/session_dependency_factory.cc @@ -169,7 +169,7 @@ class DataChannelProxyImpl : public AbstractDataChannel::Proxy { void SendBinaryMessage(const void* data, size_t length) override { auto buffer = make_scoped_ptr(new webrtc::DataBuffer(rtc::Buffer(), true)); - buffer->data.SetData(data, length); + buffer->data.SetData(static_cast<const uint8_t*>(data), length); signaling_thread_task_runner_->PostTask( FROM_HERE, base::Bind( @@ -243,7 +243,8 @@ class DataChannelImpl : public AbstractDataChannel { } void SendMessage(void* data, size_t length, bool is_binary) { - impl_->Send(webrtc::DataBuffer(rtc::Buffer(data, length), is_binary)); + impl_->Send(webrtc::DataBuffer( + rtc::Buffer(static_cast<uint8_t*>(data), length), is_binary)); } void Close() override { |