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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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/JPEGImageDecoderTest.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp
index 21c6bb45eb0c7f7da23acc1ac94b582ba0a533d2..95e2cfbb26d1c686af02bcf589710556acc0cbcd 100644
--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp
@@ -47,7 +47,7 @@ static const size_t LargeEnoughSize = 1000 * 1000;
namespace {
std::unique_ptr<ImageDecoder> createDecoder(size_t maxDecodedBytes) {
- return wrapUnique(new JPEGImageDecoder(
+ return WTF::wrapUnique(new JPEGImageDecoder(
ImageDecoder::AlphaNotPremultiplied,
ColorBehavior::transformToTargetForTesting(), maxDecodedBytes));
}
@@ -89,7 +89,8 @@ void readYUV(size_t maxDecodedBytes,
// Setting a dummy ImagePlanes object signals to the decoder that we want to
// do YUV decoding.
- std::unique_ptr<ImagePlanes> dummyImagePlanes = makeUnique<ImagePlanes>();
+ std::unique_ptr<ImagePlanes> dummyImagePlanes =
+ WTF::makeUnique<ImagePlanes>();
decoder->setImagePlanes(std::move(dummyImagePlanes));
bool sizeIsAvailable = decoder->isSizeAvailable();
@@ -125,7 +126,7 @@ void readYUV(size_t maxDecodedBytes,
planes[2] = ((char*)planes[1]) + rowBytes[1] * uSize.height();
std::unique_ptr<ImagePlanes> imagePlanes =
- makeUnique<ImagePlanes>(planes, rowBytes);
+ WTF::makeUnique<ImagePlanes>(planes, rowBytes);
decoder->setImagePlanes(std::move(imagePlanes));
ASSERT_TRUE(decoder->decodeToYUV());
@@ -261,7 +262,7 @@ TEST(JPEGImageDecoderTest, yuv) {
std::unique_ptr<ImageDecoder> decoder = createDecoder(230 * 230 * 4);
decoder->setData(data.get(), true);
- std::unique_ptr<ImagePlanes> imagePlanes = makeUnique<ImagePlanes>();
+ std::unique_ptr<ImagePlanes> imagePlanes = WTF::makeUnique<ImagePlanes>();
decoder->setImagePlanes(std::move(imagePlanes));
ASSERT_TRUE(decoder->isSizeAvailable());
ASSERT_FALSE(decoder->canDecodeToYUV());

Powered by Google App Engine
This is Rietveld 408576698