diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-06 21:45:59 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-06 21:45:59 +0000 |
commit | 01233c5482d3e093353dc9099289dc1b3a04698d (patch) | |
tree | b23f25b92c0245c4f19e313ad8c157391f96e9f0 | |
parent | 6029e6cc519e2334af00c3d06bb38eff731d7455 (diff) | |
download | chromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.zip chromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.tar.gz chromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.tar.bz2 |
NaCl: Update revision in DEPS, r8480 -> r8500
This pulls in the following Native Client changes:
r8481: (robertm) Enable an additional shared lib for the pnacl ld experiments.
r8482: (nfullagar) Build gtest with -Wno-missing-field-initializers. A recent change in
r8483: (robertm) Do not ignore unresolved symbols during pnacl dynamic links.
r8484: (robertm) Prevent any of "fixedfeaturecpu" tests to be run under pnacl.
r8485: (robertm) Make pnacl drivers work static and PIC
r8486: (dschuff) Add sandboxed translator to arm HW spec run
r8487: (ncbray) Make the browser tester use the real IP of the machine it is running on.
r8488: (robertm) Add a step for PIC mode testing to the pnacl toolchain testers.
r8489: (robertm) Make the pnacl shared linking experiment work completely without glibc
r8490: (robertm) Enable pic test for real
r8491: (khim) Add few more CPU-detectable bits to nacl_cpuid.[ch]
r8492: (robertm) Make the pnacl dynamic loader experiment call into the ld.so.
r8493: (dschuff) Don't use slash in buildbot step name; it causes the stdio output URL to be wrong on the web interface.
r8494: (kschimpf) Make default table rows explicit.
r8495: (ncbray) Browser tester: dump entire net log if no URLs are loaded.
r8496: (khim) Disable mach_forward_untrusted_caught_test on coverage bot
r8497: (kschimpf) Remove "x not y" implicit relationships from the table and make explicit!
r8498: (robertm) Roll toolchain deps to rev 8495
*r8500: (mseaborn) Exception handling: Windows: Add "const" in some places
* The change r8500 above requires a small const fix.
BUG=none
TEST=nacl_integration
Review URL: https://chromiumcodereview.appspot.com/10384006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135604 0039d316-1c4b-4281-b951-d872f2087c98
-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))) |