third_party/WebKit/Source/platform/graphics/filters/FEMerge.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/filters/FEMerge.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:

Index: third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp

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

index 8c55d52e08a749c4c4440bf476a25e034f696db6..3b1cccd834993390ac92eb33059d07ec67f2a4a2 100644

--- a/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp

+++ b/third_party/WebKit/Source/platform/graphics/filters/FEMerge.cpp

@@ -25,8 +25,7 @@

#include "SkMergeImageFilter.h"

#include "platform/graphics/filters/SkiaImageFilterBuilder.h"

#include "platform/text/TextStream.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

+#include "wtf/OwnPtr.h"

namespace blink {

@@ -44,7 +43,7 @@ sk_sp<SkImageFilter> FEMerge::createImageFilter()

{

unsigned size = numberOfEffectInputs();

- std::unique_ptr<sk_sp<SkImageFilter>[]> inputRefs = wrapArrayUnique(new sk_sp<SkImageFilter>[size]);

+ OwnPtr<sk_sp<SkImageFilter>[]> inputRefs = adoptArrayPtr(new sk_sp<SkImageFilter>[size]);

for (unsigned i = 0; i < size; ++i)

inputRefs[i] = SkiaImageFilterBuilder::build(inputEffect(i), operatingColorSpace());

SkImageFilter::CropRect rect = getCropRect();