third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp - Issue 2050123002: 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/image-decoders/jpeg/JPEGImageDecoder.cpp

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

Patch Set: First attempt to land. 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/image-decoders/jpeg/JPEGImageDecoder.h ('k') | third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

index 95bb9acdc865b99a90f721ad01681aa1a9f36196..63827d47422ff0c17e4a010c501df144a1e88704 100644

--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

@@ -39,7 +39,9 @@

#include "platform/Histogram.h"

#include "platform/PlatformInstrumentation.h"

+#include "wtf/PtrUtil.h"

#include "wtf/Threading.h"

+#include <memory>

extern "C" {

#include <stdio.h> // jpeglib.h needs stdio FILE.

@@ -793,7 +795,7 @@ bool JPEGImageDecoder::decodeToYUV()

return !failed();

}

-void JPEGImageDecoder::setImagePlanes(PassOwnPtr<ImagePlanes> imagePlanes)

+void JPEGImageDecoder::setImagePlanes(std::unique_ptr<ImagePlanes> imagePlanes)

{

m_imagePlanes = std::move(imagePlanes);

}

@@ -988,7 +990,7 @@ void JPEGImageDecoder::decode(bool onlySize)

return;

if (!m_reader) {

- m_reader = adoptPtr(new JPEGImageReader(this));

+ m_reader = wrapUnique(new JPEGImageReader(this));

m_reader->setData(m_data.get());

}