From 60a7dbf7faabe2a3b8caf306d8d2a01bfdcd5b59 Mon Sep 17 00:00:00 2001 From: jamesr Date: Thu, 6 Nov 2014 17:24:51 -0800 Subject: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac This updates the mojo sdk and updates chromium code to match. The most significant change is updating references to the mojo JS bindings code, which reshuffled. This part was reviewed separately by hansmuller@ in https://codereview.chromium.org/693343003/. This also updates ipc/mojo to reflect changes in ChannelInfo. R=morrita@chromium.org for ipc/mojo R=jam@chromium.org for top-level approval of the rest Review URL: https://codereview.chromium.org/703273002 Cr-Commit-Position: refs/heads/master@{#303149} --- mojo/edk/system/local_data_pipe.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mojo/edk/system/local_data_pipe.h') diff --git a/mojo/edk/system/local_data_pipe.h b/mojo/edk/system/local_data_pipe.h index 8a46c52..c98cb7e 100644 --- a/mojo/edk/system/local_data_pipe.h +++ b/mojo/edk/system/local_data_pipe.h @@ -48,7 +48,8 @@ class MOJO_SYSTEM_IMPL_EXPORT LocalDataPipe : public DataPipe { UserPointer elements, UserPointer num_bytes, uint32_t max_num_bytes_to_read, - uint32_t min_num_bytes_to_read) override; + uint32_t min_num_bytes_to_read, + bool peek) override; MojoResult ConsumerDiscardDataImplNoLock( UserPointer num_bytes, uint32_t max_num_bytes_to_discard, -- cgit v1.1