third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months 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 | « third_party/WebKit/Source/platform/graphics/ContiguousContainer.h ('k') | third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

index cb42fefa480b0aa32f03d22131e9d8205945ed00..7b8980dbab3990b1fa9a3bad7467dc8b531b49c9 100644

--- a/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ContiguousContainer.cpp

@@ -6,11 +6,10 @@

#include "wtf/Allocator.h"

#include "wtf/ContainerAnnotations.h"

-#include "wtf/PtrUtil.h"

+#include "wtf/PassOwnPtr.h"

#include "wtf/allocator/PartitionAlloc.h"

#include "wtf/allocator/Partitions.h"

#include <algorithm>

-#include <memory>

namespace blink {

@@ -175,7 +174,7 @@ ContiguousContainerBase::Buffer*

ContiguousContainerBase::allocateNewBufferForNextAllocation(size_t bufferSize, const char* typeName)

{

ASSERT(m_buffers.isEmpty() || m_endIndex == m_buffers.size() - 1);

- std::unique_ptr<Buffer> newBuffer = wrapUnique(new Buffer(bufferSize, typeName));

+ OwnPtr<Buffer> newBuffer = adoptPtr(new Buffer(bufferSize, typeName));

Buffer* bufferToReturn = newBuffer.get();

m_buffers.append(std::move(newBuffer));

m_endIndex = m_buffers.size() - 1;