diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/common/nacl_debug_exception_handler_win.cc | 4 | ||||
| -rw-r--r-- | chrome/nacl/nacl_listener.cc | 4 |
3 files changed, 4 insertions, 6 deletions
@@ -8,7 +8,7 @@ vars = { "webkit_revision": "116185", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "8480", + "nacl_revision": "8500", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "8228", # native_client/DEPS: tools_rev diff --git a/chrome/common/nacl_debug_exception_handler_win.cc b/chrome/common/nacl_debug_exception_handler_win.cc index 0458484..01206ec 100644 --- a/chrome/common/nacl_debug_exception_handler_win.cc +++ b/chrome/common/nacl_debug_exception_handler_win.cc @@ -44,11 +44,9 @@ class DebugExceptionHandler : public base::PlatformThread::Delegate { message_loop_->PostTask(FROM_HERE, base::Bind(on_connected_, attached)); if (attached) { - // TODO(mseaborn): Clean up the NaCl side to remove the need for - // a const_cast here. NaClDebugExceptionHandlerRun( nacl_process_, - reinterpret_cast<void*>(const_cast<char*>(startup_info_.data())), + reinterpret_cast<const void*>(startup_info_.data()), startup_info_.size()); } delete this; diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc index 773aa64..b48555b 100644 --- a/chrome/nacl/nacl_listener.cc +++ b/chrome/nacl/nacl_listener.cc @@ -84,8 +84,8 @@ int BrokerDuplicateHandle(NaClHandle source_handle, options); } -int AttachDebugExceptionHandler(void* info, size_t info_size) { - std::string info_string(reinterpret_cast<char*>(info), info_size); +int AttachDebugExceptionHandler(const void* info, size_t info_size) { + std::string info_string(reinterpret_cast<const char*>(info), info_size); bool result = false; if (!g_listener->Send(new NaClProcessMsg_AttachDebugExceptionHandler( info_string, &result))) |