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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 10 matching lines...) Expand all
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "platform/graphics/ImageDecodingStore.h" 26 #include "platform/graphics/ImageDecodingStore.h"
27 27
28 #include "platform/graphics/ImageFrameGenerator.h" 28 #include "platform/graphics/ImageFrameGenerator.h"
29 #include "platform/graphics/test/MockImageDecoder.h" 29 #include "platform/graphics/test/MockImageDecoder.h"
30 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
31 #include <memory>
31 32
32 namespace blink { 33 namespace blink {
33 34
34 class ImageDecodingStoreTest : public ::testing::Test, public MockImageDecoderCl ient { 35 class ImageDecodingStoreTest : public ::testing::Test, public MockImageDecoderCl ient {
35 public: 36 public:
36 void SetUp() override 37 void SetUp() override
37 { 38 {
38 ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024); 39 ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
39 m_generator = ImageFrameGenerator::create(SkISize::Make(100, 100), true) ; 40 m_generator = ImageFrameGenerator::create(SkISize::Make(100, 100), true) ;
40 m_decodersDestroyed = 0; 41 m_decodersDestroyed = 0;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 ImageDecodingStore::instance().setCacheLimitInBytes(0); 76 ImageDecodingStore::instance().setCacheLimitInBytes(0);
76 } 77 }
77 78
78 RefPtr<ImageFrameGenerator> m_generator; 79 RefPtr<ImageFrameGenerator> m_generator;
79 int m_decodersDestroyed; 80 int m_decodersDestroyed;
80 }; 81 };
81 82
82 TEST_F(ImageDecodingStoreTest, insertDecoder) 83 TEST_F(ImageDecodingStoreTest, insertDecoder)
83 { 84 {
84 const SkISize size = SkISize::Make(1, 1); 85 const SkISize size = SkISize::Make(1, 1);
85 OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this); 86 std::unique_ptr<ImageDecoder> decoder = MockImageDecoder::create(this);
86 decoder->setSize(1, 1); 87 decoder->setSize(1, 1);
87 const ImageDecoder* refDecoder = decoder.get(); 88 const ImageDecoder* refDecoder = decoder.get();
88 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder)); 89 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder));
89 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries()); 90 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
90 EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes()); 91 EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
91 92
92 ImageDecoder* testDecoder; 93 ImageDecoder* testDecoder;
93 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), si ze, &testDecoder)); 94 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), si ze, &testDecoder));
94 EXPECT_TRUE(testDecoder); 95 EXPECT_TRUE(testDecoder);
95 EXPECT_EQ(refDecoder, testDecoder); 96 EXPECT_EQ(refDecoder, testDecoder);
96 ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder) ; 97 ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder) ;
97 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries()); 98 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
98 } 99 }
99 100
100 TEST_F(ImageDecodingStoreTest, evictDecoder) 101 TEST_F(ImageDecodingStoreTest, evictDecoder)
101 { 102 {
102 OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this); 103 std::unique_ptr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
103 OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this); 104 std::unique_ptr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
104 OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this); 105 std::unique_ptr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
105 decoder1->setSize(1, 1); 106 decoder1->setSize(1, 1);
106 decoder2->setSize(2, 2); 107 decoder2->setSize(2, 2);
107 decoder3->setSize(3, 3); 108 decoder3->setSize(3, 3);
108 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder1)); 109 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder1));
109 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder2)); 110 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder2));
110 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder3)); 111 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder3));
111 EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries()); 112 EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
112 EXPECT_EQ(56u, ImageDecodingStore::instance().memoryUsageInBytes()); 113 EXPECT_EQ(56u, ImageDecodingStore::instance().memoryUsageInBytes());
113 114
114 evictOneCache(); 115 evictOneCache();
115 EXPECT_EQ(2, ImageDecodingStore::instance().cacheEntries()); 116 EXPECT_EQ(2, ImageDecodingStore::instance().cacheEntries());
116 EXPECT_EQ(52u, ImageDecodingStore::instance().memoryUsageInBytes()); 117 EXPECT_EQ(52u, ImageDecodingStore::instance().memoryUsageInBytes());
117 118
118 evictOneCache(); 119 evictOneCache();
119 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries()); 120 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
120 EXPECT_EQ(36u, ImageDecodingStore::instance().memoryUsageInBytes()); 121 EXPECT_EQ(36u, ImageDecodingStore::instance().memoryUsageInBytes());
121 122
122 evictOneCache(); 123 evictOneCache();
123 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries()); 124 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
124 EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes()); 125 EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes());
125 } 126 }
126 127
127 TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted) 128 TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)
128 { 129 {
129 OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this); 130 std::unique_ptr<ImageDecoder> decoder1 = MockImageDecoder::create(this);
130 OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this); 131 std::unique_ptr<ImageDecoder> decoder2 = MockImageDecoder::create(this);
131 OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this); 132 std::unique_ptr<ImageDecoder> decoder3 = MockImageDecoder::create(this);
132 decoder1->setSize(1, 1); 133 decoder1->setSize(1, 1);
133 decoder2->setSize(2, 2); 134 decoder2->setSize(2, 2);
134 decoder3->setSize(3, 3); 135 decoder3->setSize(3, 3);
135 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder1)); 136 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder1));
136 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder2)); 137 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder2));
137 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder3)); 138 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder3));
138 EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries()); 139 EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
139 140
140 ImageDecoder* testDecoder; 141 ImageDecoder* testDecoder;
141 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), Sk ISize::Make(2, 2), &testDecoder)); 142 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), Sk ISize::Make(2, 2), &testDecoder));
142 143
143 evictOneCache(); 144 evictOneCache();
144 evictOneCache(); 145 evictOneCache();
145 evictOneCache(); 146 evictOneCache();
146 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries()); 147 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
147 EXPECT_EQ(16u, ImageDecodingStore::instance().memoryUsageInBytes()); 148 EXPECT_EQ(16u, ImageDecodingStore::instance().memoryUsageInBytes());
148 149
149 ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder) ; 150 ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder) ;
150 evictOneCache(); 151 evictOneCache();
151 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries()); 152 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
152 EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes()); 153 EXPECT_FALSE(ImageDecodingStore::instance().memoryUsageInBytes());
153 } 154 }
154 155
155 TEST_F(ImageDecodingStoreTest, removeDecoder) 156 TEST_F(ImageDecodingStoreTest, removeDecoder)
156 { 157 {
157 const SkISize size = SkISize::Make(1, 1); 158 const SkISize size = SkISize::Make(1, 1);
158 OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this); 159 std::unique_ptr<ImageDecoder> decoder = MockImageDecoder::create(this);
159 decoder->setSize(1, 1); 160 decoder->setSize(1, 1);
160 const ImageDecoder* refDecoder = decoder.get(); 161 const ImageDecoder* refDecoder = decoder.get();
161 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder)); 162 ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(de coder));
162 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries()); 163 EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
163 EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes()); 164 EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
164 165
165 ImageDecoder* testDecoder; 166 ImageDecoder* testDecoder;
166 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), si ze, &testDecoder)); 167 EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), si ze, &testDecoder));
167 EXPECT_TRUE(testDecoder); 168 EXPECT_TRUE(testDecoder);
168 EXPECT_EQ(refDecoder, testDecoder); 169 EXPECT_EQ(refDecoder, testDecoder);
169 ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder) ; 170 ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder) ;
170 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries()); 171 EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
171 172
172 EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), s ize, &testDecoder)); 173 EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), s ize, &testDecoder));
173 } 174 }
174 175
175 } // namespace blink 176 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698