diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/ipc/handle_win.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ipc/handle_win.cc')
| -rw-r--r-- | chromium/ipc/handle_win.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chromium/ipc/handle_win.cc b/chromium/ipc/handle_win.cc index c8511e20173..ba981c1a57b 100644 --- a/chromium/ipc/handle_win.cc +++ b/chromium/ipc/handle_win.cc @@ -15,16 +15,14 @@ namespace IPC { -HandleWin::HandleWin() : handle_(nullptr), permissions_(INVALID) {} +HandleWin::HandleWin() : handle_(INVALID_HANDLE_VALUE) {} -HandleWin::HandleWin(const HANDLE& handle, Permissions permissions) - : handle_(handle), permissions_(permissions) {} +HandleWin::HandleWin(const HANDLE& handle) : handle_(handle) {} // static void ParamTraits<HandleWin>::Write(base::Pickle* m, const param_type& p) { scoped_refptr<IPC::internal::HandleAttachmentWin> attachment( - new IPC::internal::HandleAttachmentWin(p.get_handle(), - p.get_permissions())); + new IPC::internal::HandleAttachmentWin(p.get_handle())); if (!m->WriteAttachment(std::move(attachment))) NOTREACHED(); } @@ -42,15 +40,13 @@ bool ParamTraits<HandleWin>::Read(const base::Pickle* m, return false; IPC::internal::HandleAttachmentWin* handle_attachment = static_cast<IPC::internal::HandleAttachmentWin*>(attachment); - r->set_handle(handle_attachment->get_handle()); - handle_attachment->reset_handle_ownership(); + r->set_handle(handle_attachment->Take()); return true; } // static void ParamTraits<HandleWin>::Log(const param_type& p, std::string* l) { l->append(base::StringPrintf("0x%p", p.get_handle())); - l->append(base::IntToString(p.get_permissions())); } } // namespace IPC |