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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.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
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 63827d47422ff0c17e4a010c501df144a1e88704..95bb9acdc865b99a90f721ad01681aa1a9f36196 100644
--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -39,9 +39,7 @@
#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.
@@ -795,7 +793,7 @@ bool JPEGImageDecoder::decodeToYUV()
return !failed();
}
-void JPEGImageDecoder::setImagePlanes(std::unique_ptr<ImagePlanes> imagePlanes)
+void JPEGImageDecoder::setImagePlanes(PassOwnPtr<ImagePlanes> imagePlanes)
{
m_imagePlanes = std::move(imagePlanes);
}
@@ -990,7 +988,7 @@ void JPEGImageDecoder::decode(bool onlySize)
return;
if (!m_reader) {
- m_reader = wrapUnique(new JPEGImageReader(this));
+ m_reader = adoptPtr(new JPEGImageReader(this));
m_reader->setData(m_data.get());
}

Powered by Google App Engine
This is Rietveld 408576698