From a40775d038de9a6a75db3965104abe56b77c9ed6 Mon Sep 17 00:00:00 2001 From: erikchen Date: Sat, 29 Apr 2017 00:15:49 -0700 Subject: [PATCH] Get rid of base::SharedMemory::NULLHandle(); This CL is a refactor and has no intended behavior change. NullHandle() has two use cases: * Create an invalid handle. * Return an object that can be compared against a handle to check validity. The former is also the behavior of the default constructor of base::SharedMemoryHandle, and the latter should be done with the member IsValid(). Fixing the latter also allows the removal of operator== and operator!=. BUG=713763 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Review-Url: https://codereview.chromium.org/2849633002 Cr-Commit-Position: refs/heads/master@{#468231} --- base/memory/shared_memory.h | 8 +++----- base/memory/shared_memory_handle.h | 8 -------- base/memory/shared_memory_handle_mac.cc | 20 ------------------- base/memory/shared_memory_handle_win.cc | 12 ----------- base/memory/shared_memory_mac.cc | 5 ----- base/memory/shared_memory_nacl.cc | 5 ----- base/memory/shared_memory_posix.cc | 5 ----- base/memory/shared_memory_win.cc | 5 ----- .../discardable_shared_memory_manager.cc | 6 +++--- components/nacl/common/nacl_types.cc | 7 ++----- components/nacl/renderer/nexe_load_manager.cc | 4 +--- ..._contents_video_capture_device_unittest.cc | 2 +- .../clipboard_message_filter_unittest.cc | 2 +- .../renderer_host/render_message_filter.cc | 1 - .../render_widget_host_view_aura_unittest.cc | 4 ++-- .../media/audio_message_filter_unittest.cc | 4 ++-- .../pepper/mock_renderer_ppapi_host.cc | 2 +- .../pepper/pepper_audio_input_host.cc | 6 ++---- .../pepper/pepper_audio_output_host.cc | 4 ++-- .../renderer/renderer_blink_platform_impl.cc | 3 +-- gpu/ipc/client/gpu_channel_host.cc | 2 +- media/base/video_frame.cc | 3 +-- .../content/thread_safe_capture_oracle.cc | 2 +- mojo/edk/embedder/embedder.h | 4 ++-- ppapi/nacl_irt/ppapi_dispatcher.cc | 2 +- ppapi/proxy/gamepad_resource.cc | 2 +- .../proxy/media_stream_track_resource_base.cc | 2 +- ppapi/proxy/plugin_array_buffer_var.cc | 3 +-- ppapi/proxy/ppb_audio_proxy.cc | 2 +- ppapi/proxy/ppb_graphics_3d_proxy.cc | 2 +- ppapi/proxy/proxy_channel.cc | 2 +- ppapi/proxy/serialized_handle.cc | 3 --- ppapi/proxy/serialized_handle.h | 8 +++----- ppapi/proxy/video_decoder_resource.cc | 2 +- ui/gfx/gpu_memory_buffer.cc | 4 +--- ui/surface/transport_dib.h | 6 ------ 36 files changed, 38 insertions(+), 124 deletions(-) diff --git a/base/memory/shared_memory.h b/base/memory/shared_memory.h index d3daa80717432d..34cdc1ed16273b 100644 --- a/base/memory/shared_memory.h +++ b/base/memory/shared_memory.h @@ -92,17 +92,15 @@ class BASE_EXPORT SharedMemory { // invalid value; NULL for a HANDLE and -1 for a file descriptor) static bool IsHandleValid(const SharedMemoryHandle& handle); - // Returns invalid handle (see comment above for exact definition). - static SharedMemoryHandle NULLHandle(); - // Closes a shared memory handle. static void CloseHandle(const SharedMemoryHandle& handle); // Returns the maximum number of handles that can be open at once per process. static size_t GetHandleLimit(); - // Duplicates The underlying OS primitive. Returns NULLHandle() on failure. - // The caller is responsible for destroying the duplicated OS primitive. + // Duplicates The underlying OS primitive. Returns an invalid handle on + // failure. The caller is responsible for destroying the duplicated OS + // primitive. static SharedMemoryHandle DuplicateHandle(const SharedMemoryHandle& handle); #if defined(OS_POSIX) diff --git a/base/memory/shared_memory_handle.h b/base/memory/shared_memory_handle.h index 4af796bfa140a3..c0a016f5dcdd94 100644 --- a/base/memory/shared_memory_handle.h +++ b/base/memory/shared_memory_handle.h @@ -83,10 +83,6 @@ class BASE_EXPORT SharedMemoryHandle { mach_vm_size_t size, base::ProcessId pid); - // Comparison operators. - bool operator==(const SharedMemoryHandle& handle) const; - bool operator!=(const SharedMemoryHandle& handle) const; - // Duplicates the underlying OS resources. SharedMemoryHandle Duplicate() const; @@ -106,10 +102,6 @@ class BASE_EXPORT SharedMemoryHandle { #elif defined(OS_WIN) SharedMemoryHandle(HANDLE h, base::ProcessId pid); - // Comparison operators. - bool operator==(const SharedMemoryHandle& handle) const; - bool operator!=(const SharedMemoryHandle& handle) const; - // Whether |pid_| is the same as the current process's id. bool BelongsToCurrentProcess() const; diff --git a/base/memory/shared_memory_handle_mac.cc b/base/memory/shared_memory_handle_mac.cc index 9dfd3c1aeacbbc..d5c5fbad415d05 100644 --- a/base/memory/shared_memory_handle_mac.cc +++ b/base/memory/shared_memory_handle_mac.cc @@ -91,26 +91,6 @@ SharedMemoryHandle SharedMemoryHandle::Duplicate() const { } } -bool SharedMemoryHandle::operator==(const SharedMemoryHandle& handle) const { - if (!IsValid() && !handle.IsValid()) - return true; - - if (type_ != handle.type_) - return false; - - switch (type_) { - case POSIX: - return file_descriptor_.fd == handle.file_descriptor_.fd; - case MACH: - return memory_object_ == handle.memory_object_ && size_ == handle.size_ && - pid_ == handle.pid_; - } -} - -bool SharedMemoryHandle::operator!=(const SharedMemoryHandle& handle) const { - return !(*this == handle); -} - bool SharedMemoryHandle::IsValid() const { switch (type_) { case POSIX: diff --git a/base/memory/shared_memory_handle_win.cc b/base/memory/shared_memory_handle_win.cc index a2ff91abd2c6c7..277a954daa1cd2 100644 --- a/base/memory/shared_memory_handle_win.cc +++ b/base/memory/shared_memory_handle_win.cc @@ -30,18 +30,6 @@ SharedMemoryHandle& SharedMemoryHandle::operator=( return *this; } -bool SharedMemoryHandle::operator==(const SharedMemoryHandle& handle) const { - // Invalid handles are always equal. - if (!IsValid() && !handle.IsValid()) - return true; - - return handle_ == handle.handle_ && pid_ == handle.pid_; -} - -bool SharedMemoryHandle::operator!=(const SharedMemoryHandle& handle) const { - return !(*this == handle); -} - void SharedMemoryHandle::Close() const { DCHECK(handle_ != nullptr); DCHECK(BelongsToCurrentProcess()); diff --git a/base/memory/shared_memory_mac.cc b/base/memory/shared_memory_mac.cc index d376daa579ee0a..6acaee425ffa48 100644 --- a/base/memory/shared_memory_mac.cc +++ b/base/memory/shared_memory_mac.cc @@ -108,11 +108,6 @@ bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) { return handle.IsValid(); } -// static -SharedMemoryHandle SharedMemory::NULLHandle() { - return SharedMemoryHandle(); -} - // static void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { handle.Close(); diff --git a/base/memory/shared_memory_nacl.cc b/base/memory/shared_memory_nacl.cc index 74d3fcad48863d..670ade5ff34273 100644 --- a/base/memory/shared_memory_nacl.cc +++ b/base/memory/shared_memory_nacl.cc @@ -37,11 +37,6 @@ bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) { return handle.IsValid(); } -// static -SharedMemoryHandle SharedMemory::NULLHandle() { - return SharedMemoryHandle(); -} - // static void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { DCHECK(handle.IsValid()); diff --git a/base/memory/shared_memory_posix.cc b/base/memory/shared_memory_posix.cc index 997b3f46e0e0f8..2032e26e8d80c8 100644 --- a/base/memory/shared_memory_posix.cc +++ b/base/memory/shared_memory_posix.cc @@ -57,11 +57,6 @@ bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) { return handle.IsValid(); } -// static -SharedMemoryHandle SharedMemory::NULLHandle() { - return SharedMemoryHandle(); -} - // static void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { DCHECK(handle.IsValid()); diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc index 9b6135e8b2fb12..ebe1f7bd858062 100644 --- a/base/memory/shared_memory_win.cc +++ b/base/memory/shared_memory_win.cc @@ -170,11 +170,6 @@ bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) { return handle.IsValid(); } -// static -SharedMemoryHandle SharedMemory::NULLHandle() { - return SharedMemoryHandle(); -} - // static void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { handle.Close(); diff --git a/components/discardable_memory/service/discardable_shared_memory_manager.cc b/components/discardable_memory/service/discardable_shared_memory_manager.cc index e2966c798c78bf..650fc0134af455 100644 --- a/components/discardable_memory/service/discardable_shared_memory_manager.cc +++ b/components/discardable_memory/service/discardable_shared_memory_manager.cc @@ -440,7 +440,7 @@ void DiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( MemorySegmentMap& client_segments = clients_[client_id]; if (client_segments.find(id) != client_segments.end()) { LOG(ERROR) << "Invalid discardable shared memory ID"; - *shared_memory_handle = base::SharedMemory::NULLHandle(); + *shared_memory_handle = base::SharedMemoryHandle(); return; } @@ -461,14 +461,14 @@ void DiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( std::unique_ptr memory( new base::DiscardableSharedMemory); if (!memory->CreateAndMap(size)) { - *shared_memory_handle = base::SharedMemory::NULLHandle(); + *shared_memory_handle = base::SharedMemoryHandle(); return; } base::CheckedNumeric checked_bytes_allocated = bytes_allocated_; checked_bytes_allocated += memory->mapped_size(); if (!checked_bytes_allocated.IsValid()) { - *shared_memory_handle = base::SharedMemory::NULLHandle(); + *shared_memory_handle = base::SharedMemoryHandle(); return; } diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc index 4f6d36f12f2255..76bbfa658931c8 100644 --- a/components/nacl/common/nacl_types.cc +++ b/components/nacl/common/nacl_types.cc @@ -16,8 +16,7 @@ NaClStartParams::NaClStartParams() #endif validation_cache_enabled(false), enable_debug_stub(false), - process_type(kUnknownNaClProcessType), - crash_info_shmem_handle(base::SharedMemory::NULLHandle()) { + process_type(kUnknownNaClProcessType) { } NaClStartParams::NaClStartParams(const NaClStartParams& other) = default; @@ -91,9 +90,7 @@ NaClLaunchResult::NaClLaunchResult() : ppapi_ipc_channel_handle(), trusted_ipc_channel_handle(), plugin_pid(base::kNullProcessId), - plugin_child_id(0), - crash_info_shmem_handle(base::SharedMemory::NULLHandle()) { -} + plugin_child_id(0) {} NaClLaunchResult::NaClLaunchResult( const IPC::ChannelHandle& ppapi_ipc_channel_handle, diff --git a/components/nacl/renderer/nexe_load_manager.cc b/components/nacl/renderer/nexe_load_manager.cc index 84f849f988da90..d5dbed0bd1116e 100644 --- a/components/nacl/renderer/nexe_load_manager.cc +++ b/components/nacl/renderer/nexe_load_manager.cc @@ -81,8 +81,7 @@ std::string LookupAttribute(const std::map& args, } // namespace -NexeLoadManager::NexeLoadManager( - PP_Instance pp_instance) +NexeLoadManager::NexeLoadManager(PP_Instance pp_instance) : pp_instance_(pp_instance), nacl_ready_state_(PP_NACL_READY_STATE_UNSENT), nexe_error_reported_(false), @@ -91,7 +90,6 @@ NexeLoadManager::NexeLoadManager( nexe_size_(0), plugin_instance_(content::PepperPluginInstance::Get(pp_instance)), nonsfi_(false), - crash_info_shmem_handle_(base::SharedMemory::NULLHandle()), weak_factory_(this) { set_exit_status(-1); SetLastError(""); diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc index 1983a836d3a56c..0e176386b86add 100644 --- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc +++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc @@ -300,7 +300,7 @@ class StubClient : public media::VideoCaptureDevice::Client { VideoFrame::WrapExternalSharedMemory( media::PIXEL_FORMAT_I420, format.frame_size, visible_rect, format.frame_size, buffer_access->data(), - buffer_access->mapped_size(), base::SharedMemory::NULLHandle(), 0u, + buffer_access->mapped_size(), base::SharedMemoryHandle(), 0u, base::TimeDelta()); const gfx::Point center = visible_rect.CenterPoint(); const int center_offset_y = diff --git a/content/browser/renderer_host/clipboard_message_filter_unittest.cc b/content/browser/renderer_host/clipboard_message_filter_unittest.cc index 4bc506edb26958..3e01d863c92a67 100644 --- a/content/browser/renderer_host/clipboard_message_filter_unittest.cc +++ b/content/browser/renderer_host/clipboard_message_filter_unittest.cc @@ -123,7 +123,7 @@ TEST_F(ClipboardMessageFilterTest, ImageSizeOverflows32BitRowBytes) { } TEST_F(ClipboardMessageFilterTest, InvalidSharedMemoryHandle) { - CallWriteImageDirectly(gfx::Size(5, 5), base::SharedMemory::NULLHandle()); + CallWriteImageDirectly(gfx::Size(5, 5), base::SharedMemoryHandle()); uint64_t sequence_number = clipboard()->GetSequenceNumber(ui::CLIPBOARD_TYPE_COPY_PASTE); CallCommitWrite(); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 90008a31a08fff..216d089790e507 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -239,7 +239,6 @@ void RenderMessageFilter::SendLoadFontReply(IPC::Message* reply, if (result->font_data_size == 0 || result->font_id == 0) { result->font_data_size = 0; result->font_id = 0; - handle = base::SharedMemory::NULLHandle(); } else { result->font_data.GiveToProcess(base::GetCurrentProcessHandle(), &handle); } diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index aea4d89025e6b0..c47873eb96085c 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -2869,8 +2869,8 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) { display_compositor::HostSharedBitmapManager::current()); for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) { - bitmap_client.ChildAllocatedSharedBitmap( - 1, base::SharedMemory::NULLHandle(), cc::SharedBitmap::GenerateId()); + bitmap_client.ChildAllocatedSharedBitmap(1, base::SharedMemoryHandle(), + cc::SharedBitmap::GenerateId()); } // Hiding this last bitmap should evict all but two frames. diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc index 33eef882b08c42..6bd6a81721b8de 100644 --- a/content/renderer/media/audio_message_filter_unittest.cc +++ b/content/renderer/media/audio_message_filter_unittest.cc @@ -54,7 +54,7 @@ class MockAudioDelegate : public media::AudioOutputIPCDelegate { device_status_ = media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL; created_received_ = false; - handle_ = base::SharedMemory::NULLHandle(); + handle_ = base::SharedMemoryHandle(); length_ = 0; volume_received_ = false; @@ -130,7 +130,7 @@ TEST(AudioMessageFilterTest, Basic) { const uint32_t kLength = 1024; EXPECT_FALSE(delegate.created_received()); filter->OnMessageReceived(AudioMsg_NotifyStreamCreated( - kStreamId, base::SharedMemory::NULLHandle(), socket_descriptor, kLength)); + kStreamId, base::SharedMemoryHandle(), socket_descriptor, kLength)); EXPECT_TRUE(delegate.created_received()); EXPECT_FALSE(base::SharedMemory::IsHandleValid(delegate.handle())); EXPECT_EQ(kLength, delegate.length()); diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.cc b/content/renderer/pepper/mock_renderer_ppapi_host.cc index 6f39f0fb7d9e26..c5cebdac9daf72 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.cc +++ b/content/renderer/pepper/mock_renderer_ppapi_host.cc @@ -87,7 +87,7 @@ base::SharedMemoryHandle MockRendererPpapiHost::ShareSharedMemoryHandleWithRemote( const base::SharedMemoryHandle& handle) { NOTIMPLEMENTED(); - return base::SharedMemory::NULLHandle(); + return base::SharedMemoryHandle(); } bool MockRendererPpapiHost::IsRunningInProcess() const { return false; } diff --git a/content/renderer/pepper/pepper_audio_input_host.cc b/content/renderer/pepper/pepper_audio_input_host.cc index 1805eb7d3f7aa0..df4383fc656af4 100644 --- a/content/renderer/pepper/pepper_audio_input_host.cc +++ b/content/renderer/pepper/pepper_audio_input_host.cc @@ -67,9 +67,7 @@ void PepperAudioInputHost::StreamCreated( } void PepperAudioInputHost::StreamCreationFailed() { - OnOpenComplete(PP_ERROR_FAILED, - base::SharedMemory::NULLHandle(), - 0, + OnOpenComplete(PP_ERROR_FAILED, base::SharedMemoryHandle(), 0, base::SyncSocket::kInvalidHandle); } @@ -144,7 +142,7 @@ void PepperAudioInputHost::OnOpenComplete( if (result == PP_OK) { IPC::PlatformFileForTransit temp_socket = IPC::InvalidPlatformFileForTransit(); - base::SharedMemoryHandle temp_shmem = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle temp_shmem; result = GetRemoteHandles( scoped_socket, scoped_shared_memory, &temp_socket, &temp_shmem); diff --git a/content/renderer/pepper/pepper_audio_output_host.cc b/content/renderer/pepper/pepper_audio_output_host.cc index 6f264b97666e1a..59674b7367bbd1 100644 --- a/content/renderer/pepper/pepper_audio_output_host.cc +++ b/content/renderer/pepper/pepper_audio_output_host.cc @@ -86,7 +86,7 @@ void PepperAudioOutputHost::StreamCreated( } void PepperAudioOutputHost::StreamCreationFailed() { - OnOpenComplete(PP_ERROR_FAILED, base::SharedMemory::NULLHandle(), 0, + OnOpenComplete(PP_ERROR_FAILED, base::SharedMemoryHandle(), 0, base::SyncSocket::kInvalidHandle); } @@ -182,7 +182,7 @@ void PepperAudioOutputHost::OnOpenComplete( if (result == PP_OK) { IPC::PlatformFileForTransit temp_socket = IPC::InvalidPlatformFileForTransit(); - base::SharedMemoryHandle temp_shmem = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle temp_shmem; result = GetRemoteHandles(scoped_socket, scoped_shared_memory, &temp_socket, &temp_shmem); diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index f299044aed658e..371943b8479728 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -546,8 +546,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::LoadFont(NSFont* src_font, return false; } - if (font_data_size == 0 || font_data == base::SharedMemory::NULLHandle() || - *font_id == 0) { + if (font_data_size == 0 || !font_data.IsValid() || *font_id == 0) { LOG(ERROR) << "Bad response from RenderProcessHostMsg_LoadFont() for " << src_font_descriptor.font_name; *out = NULL; diff --git a/gpu/ipc/client/gpu_channel_host.cc b/gpu/ipc/client/gpu_channel_host.cc index af0c167aff22de..aa22cdc6ab475c 100644 --- a/gpu/ipc/client/gpu_channel_host.cc +++ b/gpu/ipc/client/gpu_channel_host.cc @@ -227,7 +227,7 @@ void GpuChannelHost::RemoveRoute(int route_id) { base::SharedMemoryHandle GpuChannelHost::ShareToGpuProcess( const base::SharedMemoryHandle& source_handle) { if (IsLost()) - return base::SharedMemory::NULLHandle(); + return base::SharedMemoryHandle(); return base::SharedMemory::DuplicateHandle(source_handle); } diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 500842c51b77b8..7ac322a0f8499c 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -231,7 +231,7 @@ scoped_refptr VideoFrame::WrapExternalData( base::TimeDelta timestamp) { return WrapExternalStorage(format, STORAGE_UNOWNED_MEMORY, coded_size, visible_rect, natural_size, data, data_size, - timestamp, base::SharedMemory::NULLHandle(), 0); + timestamp, base::SharedMemoryHandle(), 0); } // static @@ -925,7 +925,6 @@ VideoFrame::VideoFrame(VideoPixelFormat format, coded_size_(coded_size), visible_rect_(visible_rect), natural_size_(natural_size), - shared_memory_handle_(base::SharedMemory::NULLHandle()), shared_memory_offset_(0), timestamp_(timestamp), unique_id_(g_unique_id_generator.GetNext()) { diff --git a/media/capture/content/thread_safe_capture_oracle.cc b/media/capture/content/thread_safe_capture_oracle.cc index 68240676129304..0f817d14ab6613 100644 --- a/media/capture/content/thread_safe_capture_oracle.cc +++ b/media/capture/content/thread_safe_capture_oracle.cc @@ -141,7 +141,7 @@ bool ThreadSafeCaptureOracle::ObserveEventAndDecideCapture( *storage = VideoFrame::WrapExternalSharedMemory( params_.requested_format.pixel_format, coded_size, gfx::Rect(visible_size), visible_size, output_buffer_access->data(), - output_buffer_access->mapped_size(), base::SharedMemory::NULLHandle(), 0u, + output_buffer_access->mapped_size(), base::SharedMemoryHandle(), 0u, base::TimeDelta()); // If creating the VideoFrame wrapper failed, call DidCaptureFrame() with // !success to execute the required post-capture steps (tracing, notification diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h index 97258e52f61d53..e3122c68e5a5fb 100644 --- a/mojo/edk/embedder/embedder.h +++ b/mojo/edk/embedder/embedder.h @@ -109,8 +109,8 @@ CreateSharedBufferWrapper(base::SharedMemoryHandle shared_memory_handle, // |MojoHandle| and closes the handle. If successful, |num_bytes| will contain // the size of the shared memory buffer and |read_only| will contain whether the // buffer handle is read-only. Both |num_bytes| and |read_only| may be null. -// Note: The value of |shared_memory_handle| may be -// base::SharedMemory::NULLHandle(), even if this function returns success. +// Note: |shared_memory_handle| may be invalid even if this function returns +// success. // Callers should perform appropriate checks. MOJO_SYSTEM_IMPL_EXPORT MojoResult PassSharedMemoryHandle(MojoHandle mojo_handle, diff --git a/ppapi/nacl_irt/ppapi_dispatcher.cc b/ppapi/nacl_irt/ppapi_dispatcher.cc index 460dbec3df3c6f..70fc3a25ffb607 100644 --- a/ppapi/nacl_irt/ppapi_dispatcher.cc +++ b/ppapi/nacl_irt/ppapi_dispatcher.cc @@ -74,7 +74,7 @@ IPC::PlatformFileForTransit PpapiDispatcher::ShareHandleWithRemote( base::SharedMemoryHandle PpapiDispatcher::ShareSharedMemoryHandleWithRemote( const base::SharedMemoryHandle& handle, base::ProcessId remote_pid) { - return base::SharedMemory::NULLHandle(); + return base::SharedMemoryHandle(); } std::set* PpapiDispatcher::GetGloballySeenInstanceIDSet() { diff --git a/ppapi/proxy/gamepad_resource.cc b/ppapi/proxy/gamepad_resource.cc index 1cfc0419705d0a..67253034c0dff8 100644 --- a/ppapi/proxy/gamepad_resource.cc +++ b/ppapi/proxy/gamepad_resource.cc @@ -103,7 +103,7 @@ void GamepadResource::Sample(PP_Instance /* instance */, void GamepadResource::OnPluginMsgSendMemory( const ResourceMessageReplyParams& params) { // On failure, the handle will be null and the CHECK below will be tripped. - base::SharedMemoryHandle handle = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle handle; params.TakeSharedMemoryHandleAtIndex(0, &handle); shared_memory_.reset(new base::SharedMemory(handle, true)); diff --git a/ppapi/proxy/media_stream_track_resource_base.cc b/ppapi/proxy/media_stream_track_resource_base.cc index 4e20325f9a593a..a758b3c63ff7f2 100644 --- a/ppapi/proxy/media_stream_track_resource_base.cc +++ b/ppapi/proxy/media_stream_track_resource_base.cc @@ -70,7 +70,7 @@ void MediaStreamTrackResourceBase::OnPluginMsgInitBuffers( int32_t number_of_buffers, int32_t buffer_size, bool readonly) { - base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle shm_handle; params.TakeSharedMemoryHandleAtIndex(0, &shm_handle); buffer_manager_.SetBuffers(number_of_buffers, buffer_size, std::unique_ptr( diff --git a/ppapi/proxy/plugin_array_buffer_var.cc b/ppapi/proxy/plugin_array_buffer_var.cc index 625facfa0a6765..da53d560496dc6 100644 --- a/ppapi/proxy/plugin_array_buffer_var.cc +++ b/ppapi/proxy/plugin_array_buffer_var.cc @@ -28,7 +28,6 @@ namespace ppapi { PluginArrayBufferVar::PluginArrayBufferVar(uint32_t size_in_bytes) : buffer_(size_in_bytes), - plugin_handle_(base::SharedMemory::NULLHandle()), size_in_bytes_(size_in_bytes) {} PluginArrayBufferVar::PluginArrayBufferVar(uint32_t size_in_bytes, @@ -99,7 +98,7 @@ bool PluginArrayBufferVar::CopyToNewShmem( // We don't need to keep the shared memory around on the plugin side; // we've already copied all our data into it. We'll make it invalid // just to be safe. - *plugin_out_handle = base::SharedMemory::NULLHandle(); + *plugin_out_handle = base::SharedMemoryHandle(); return true; } diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc index ed60aa1f0b83a7..0682dc02811234 100644 --- a/ppapi/proxy/ppb_audio_proxy.cc +++ b/ppapi/proxy/ppb_audio_proxy.cc @@ -249,7 +249,7 @@ void PPB_Audio_Proxy::AudioChannelConnected( const HostResource& resource) { IPC::PlatformFileForTransit socket_handle = IPC::InvalidPlatformFileForTransit(); - base::SharedMemoryHandle shared_memory = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle shared_memory; uint32_t audio_buffer_length = 0; int32_t result_code = result; diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc index 7725330b63b94c..620fdc28e0275a 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc @@ -272,7 +272,7 @@ void PPB_Graphics3D_Proxy::OnMsgCreate( if (!enter.succeeded()) return; - base::SharedMemoryHandle handle = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle handle; result->SetHostResource( instance, enter.functions()->CreateGraphics3DRaw( instance, share_context.host_resource(), attrib_helper, diff --git a/ppapi/proxy/proxy_channel.cc b/ppapi/proxy/proxy_channel.cc index fb4c815007012a..03af088553a563 100644 --- a/ppapi/proxy/proxy_channel.cc +++ b/ppapi/proxy/proxy_channel.cc @@ -71,7 +71,7 @@ IPC::PlatformFileForTransit ProxyChannel::ShareHandleWithRemote( base::SharedMemoryHandle ProxyChannel::ShareSharedMemoryHandleWithRemote( const base::SharedMemoryHandle& handle) { if (!channel_.get()) - return base::SharedMemory::NULLHandle(); + return base::SharedMemoryHandle(); DCHECK(peer_pid_ != base::kNullProcessId); return delegate_->ShareSharedMemoryHandleWithRemote(handle, peer_pid_); diff --git a/ppapi/proxy/serialized_handle.cc b/ppapi/proxy/serialized_handle.cc index 000eed5be57b66..88796cda06f086 100644 --- a/ppapi/proxy/serialized_handle.cc +++ b/ppapi/proxy/serialized_handle.cc @@ -19,7 +19,6 @@ namespace proxy { SerializedHandle::SerializedHandle() : type_(INVALID), - shm_handle_(base::SharedMemory::NULLHandle()), size_(0), descriptor_(IPC::InvalidPlatformFileForTransit()), open_flags_(0), @@ -28,7 +27,6 @@ SerializedHandle::SerializedHandle() SerializedHandle::SerializedHandle(Type type_param) : type_(type_param), - shm_handle_(base::SharedMemory::NULLHandle()), size_(0), descriptor_(IPC::InvalidPlatformFileForTransit()), open_flags_(0), @@ -48,7 +46,6 @@ SerializedHandle::SerializedHandle( Type type, const IPC::PlatformFileForTransit& socket_descriptor) : type_(type), - shm_handle_(base::SharedMemory::NULLHandle()), size_(0), descriptor_(socket_descriptor), open_flags_(0), diff --git a/ppapi/proxy/serialized_handle.h b/ppapi/proxy/serialized_handle.h index d7e74ccb5427a9..3eb59931c2e219 100644 --- a/ppapi/proxy/serialized_handle.h +++ b/ppapi/proxy/serialized_handle.h @@ -94,7 +94,7 @@ class PPAPI_PROXY_EXPORT SerializedHandle { type_ = SOCKET; descriptor_ = socket; - shm_handle_ = base::SharedMemory::NULLHandle(); + shm_handle_ = base::SharedMemoryHandle(); size_ = 0; } void set_file_handle(const IPC::PlatformFileForTransit& descriptor, @@ -103,14 +103,12 @@ class PPAPI_PROXY_EXPORT SerializedHandle { type_ = FILE; descriptor_ = descriptor; - shm_handle_ = base::SharedMemory::NULLHandle(); + shm_handle_ = base::SharedMemoryHandle(); size_ = 0; open_flags_ = open_flags; file_io_ = file_io; } - void set_null_shmem() { - set_shmem(base::SharedMemory::NULLHandle(), 0); - } + void set_null_shmem() { set_shmem(base::SharedMemoryHandle(), 0); } void set_null_socket() { set_socket(IPC::InvalidPlatformFileForTransit()); } diff --git a/ppapi/proxy/video_decoder_resource.cc b/ppapi/proxy/video_decoder_resource.cc index cb55764bff4360..26fee48177ec29 100644 --- a/ppapi/proxy/video_decoder_resource.cc +++ b/ppapi/proxy/video_decoder_resource.cc @@ -227,7 +227,7 @@ int32_t VideoDecoderResource::Decode(uint32_t decode_id, if (!UnpackMessage(reply, &shm_size)) return PP_ERROR_FAILED; - base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle(); + base::SharedMemoryHandle shm_handle; if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &shm_handle)) return PP_ERROR_NOMEMORY; std::unique_ptr shm( diff --git a/ui/gfx/gpu_memory_buffer.cc b/ui/gfx/gpu_memory_buffer.cc index 185d461c637f5f..e4e42434fabf9a 100644 --- a/ui/gfx/gpu_memory_buffer.cc +++ b/ui/gfx/gpu_memory_buffer.cc @@ -8,9 +8,7 @@ namespace gfx { -GpuMemoryBufferHandle::GpuMemoryBufferHandle() - : type(EMPTY_BUFFER), id(0), handle(base::SharedMemory::NULLHandle()) { -} +GpuMemoryBufferHandle::GpuMemoryBufferHandle() : type(EMPTY_BUFFER), id(0) {} GpuMemoryBufferHandle::GpuMemoryBufferHandle( const GpuMemoryBufferHandle& other) = default; diff --git a/ui/surface/transport_dib.h b/ui/surface/transport_dib.h index 3217b5ff8a6639..f067774232477e 100644 --- a/ui/surface/transport_dib.h +++ b/ui/surface/transport_dib.h @@ -34,12 +34,6 @@ class SURFACE_EXPORT TransportDIB { // side can map the transport DIB. typedef base::SharedMemoryHandle Handle; - // Returns a default, invalid handle, that is meant to indicate a missing - // Transport DIB. - static Handle DefaultHandleValue() { - return base::SharedMemory::NULLHandle(); - } - // Create a new TransportDIB, returning NULL on failure. // // The size is the minimum size in bytes of the memory backing the transport