Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3363)

Unified Diff: content/common/discardable_shared_memory_heap.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrequals: followupfix-after-rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | device/serial/serial_io_handler_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/discardable_shared_memory_heap.cc
diff --git a/content/common/discardable_shared_memory_heap.cc b/content/common/discardable_shared_memory_heap.cc
index 61f05d3ecd35dccb59ea9c342cf662bb3698beb4..8cf658bac8cfddcd9c22add7601a20967cc28749 100644
--- a/content/common/discardable_shared_memory_heap.cc
+++ b/content/common/discardable_shared_memory_heap.cc
@@ -64,7 +64,7 @@ bool DiscardableSharedMemoryHeap::ScopedMemorySegment::IsResident() const {
bool DiscardableSharedMemoryHeap::ScopedMemorySegment::ContainsSpan(
Span* span) const {
- return shared_memory_ == span->shared_memory();
+ return shared_memory_.get() == span->shared_memory();
}
base::trace_event::MemoryAllocatorDump*
@@ -73,7 +73,7 @@ DiscardableSharedMemoryHeap::ScopedMemorySegment::CreateMemoryAllocatorDump(
size_t block_size,
const char* name,
base::trace_event::ProcessMemoryDump* pmd) const {
- DCHECK_EQ(shared_memory_, span->shared_memory());
+ DCHECK_EQ(shared_memory_.get(), span->shared_memory());
base::trace_event::MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(name);
dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
base::trace_event::MemoryAllocatorDump::kUnitsBytes,
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | device/serial/serial_io_handler_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698