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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.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/ImageDecoderTest.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp
index 870a9a68aee29125fbe797bbdd0f2af28f881600..286cdcf4550284ba9ec8681b332e3fed1ed93ad5 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.cpp
@@ -70,7 +70,8 @@ class TestImageDecoder : public ImageDecoder {
};
TEST(ImageDecoderTest, sizeCalculationMayOverflow) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
EXPECT_FALSE(decoder->setSize(1 << 29, 1));
EXPECT_FALSE(decoder->setSize(1, 1 << 29));
EXPECT_FALSE(decoder->setSize(1 << 15, 1 << 15));
@@ -80,7 +81,8 @@ TEST(ImageDecoderTest, sizeCalculationMayOverflow) {
}
TEST(ImageDecoderTest, requiredPreviousFrameIndex) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(6);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
@@ -104,7 +106,8 @@ TEST(ImageDecoderTest, requiredPreviousFrameIndex) {
}
TEST(ImageDecoderTest, requiredPreviousFrameIndexDisposeOverwriteBgcolor) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(3);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
@@ -122,7 +125,8 @@ TEST(ImageDecoderTest, requiredPreviousFrameIndexDisposeOverwriteBgcolor) {
}
TEST(ImageDecoderTest, requiredPreviousFrameIndexForFrame1) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(2);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
@@ -150,7 +154,8 @@ TEST(ImageDecoderTest, requiredPreviousFrameIndexForFrame1) {
}
TEST(ImageDecoderTest, requiredPreviousFrameIndexBlendAtopBgcolor) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(3);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
@@ -180,7 +185,8 @@ TEST(ImageDecoderTest, requiredPreviousFrameIndexBlendAtopBgcolor) {
}
TEST(ImageDecoderTest, requiredPreviousFrameIndexKnownOpaque) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(3);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
@@ -207,7 +213,8 @@ TEST(ImageDecoderTest, requiredPreviousFrameIndexKnownOpaque) {
}
TEST(ImageDecoderTest, clearCacheExceptFrameDoNothing) {
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->clearCacheExceptFrame(0);
// This should not crash.
@@ -217,7 +224,8 @@ TEST(ImageDecoderTest, clearCacheExceptFrameDoNothing) {
TEST(ImageDecoderTest, clearCacheExceptFrameAll) {
const size_t numFrames = 10;
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(numFrames);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
for (size_t i = 0; i < numFrames; ++i)
@@ -234,7 +242,8 @@ TEST(ImageDecoderTest, clearCacheExceptFrameAll) {
TEST(ImageDecoderTest, clearCacheExceptFramePreverveClearExceptFrame) {
const size_t numFrames = 10;
- std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
+ std::unique_ptr<TestImageDecoder> decoder(
+ WTF::makeUnique<TestImageDecoder>());
decoder->initFrames(numFrames);
Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
for (size_t i = 0; i < numFrames; ++i)

Powered by Google App Engine
This is Rietveld 408576698