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

Unified Diff: third_party/WebKit/Source/platform/image-encoders/JPEGImageEncoder.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-encoders/JPEGImageEncoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-encoders/JPEGImageEncoder.cpp b/third_party/WebKit/Source/platform/image-encoders/JPEGImageEncoder.cpp
index c4c2b09b0174721e4751f602f0b9921217e63d2c..93353ff9792410b9f8be316d9eb351ce03cf88ed 100644
--- a/third_party/WebKit/Source/platform/image-encoders/JPEGImageEncoder.cpp
+++ b/third_party/WebKit/Source/platform/image-encoders/JPEGImageEncoder.cpp
@@ -34,8 +34,6 @@
#include "platform/geometry/IntSize.h"
#include "platform/graphics/ImageBuffer.h"
#include "wtf/CurrentTime.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
extern "C" {
#include <setjmp.h>
@@ -136,12 +134,12 @@ static void disableSubsamplingForHighQuality(jpeg_compress_struct* cinfo, int qu
return what_to_return; \
}
-std::unique_ptr<JPEGImageEncoderState> JPEGImageEncoderState::create(const IntSize& imageSize, const double& quality, Vector<unsigned char>* output)
+PassOwnPtr<JPEGImageEncoderState> JPEGImageEncoderState::create(const IntSize& imageSize, const double& quality, Vector<unsigned char>* output)
{
if (imageSize.width() <= 0 || imageSize.height() <= 0)
return nullptr;
- std::unique_ptr<JPEGImageEncoderStateImpl> encoderState = wrapUnique(new JPEGImageEncoderStateImpl());
+ OwnPtr<JPEGImageEncoderStateImpl> encoderState = adoptPtr(new JPEGImageEncoderStateImpl());
jpeg_compress_struct* cinfo = encoderState->cinfo();
jpeg_error_mgr* error = encoderState->error();
@@ -207,7 +205,7 @@ int JPEGImageEncoder::progressiveEncodeRowsJpegHelper(JPEGImageEncoderState* enc
return currentRowsCompleted;
}
-bool JPEGImageEncoder::encodeWithPreInitializedState(std::unique_ptr<JPEGImageEncoderState> encoderState, const unsigned char* inputPixels, int numRowsCompleted)
+bool JPEGImageEncoder::encodeWithPreInitializedState(PassOwnPtr<JPEGImageEncoderState> encoderState, const unsigned char* inputPixels, int numRowsCompleted)
{
JPEGImageEncoderStateImpl* encoderStateImpl = static_cast<JPEGImageEncoderStateImpl*>(encoderState.get());
@@ -234,7 +232,7 @@ bool JPEGImageEncoder::encode(const ImageDataBuffer& imageData, const double& qu
if (!imageData.pixels())
return false;
- std::unique_ptr<JPEGImageEncoderState> encoderState = JPEGImageEncoderState::create(imageData.size(), quality, output);
+ OwnPtr<JPEGImageEncoderState> encoderState = JPEGImageEncoderState::create(imageData.size(), quality, output);
if (!encoderState)
return false;

Powered by Google App Engine
This is Rietveld 408576698