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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: tests/MaskCacheTest.cpp

Issue 669993003: use SkMaskCache inside SkBlurMaskFilter (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « src/effects/SkBlurMaskFilter.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCachedData.h" 8 #include "SkCachedData.h"
9 #include "SkMaskCache.h" 9 #include "SkMaskCache.h"
10 #include "SkResourceCache.h" 10 #include "SkResourceCache.h"
(...skipping 21 matching lines...) Expand all
32 SkResourceCache cache(1024); 32 SkResourceCache cache(1024);
33 33
34 SkScalar sigma = 0.8f; 34 SkScalar sigma = 0.8f;
35 SkRect rect = SkRect::MakeWH(100, 100); 35 SkRect rect = SkRect::MakeWH(100, 100);
36 SkRRect rrect; 36 SkRRect rrect;
37 rrect.setRectXY(rect, 30, 30); 37 rrect.setRectXY(rect, 30, 30);
38 SkBlurStyle style = kNormal_SkBlurStyle; 38 SkBlurStyle style = kNormal_SkBlurStyle;
39 SkBlurQuality quality = kLow_SkBlurQuality; 39 SkBlurQuality quality = kLow_SkBlurQuality;
40 SkMask mask; 40 SkMask mask;
41 41
42 SkCachedData* data = SkMaskCache::FindAndRef(sigma, rrect, style, quality, & mask, &cache); 42 SkCachedData* data = SkMaskCache::FindAndRef(sigma, style, quality, rrect, & mask, &cache);
43 REPORTER_ASSERT(reporter, NULL == data); 43 REPORTER_ASSERT(reporter, NULL == data);
44 44
45 size_t size = 256; 45 size_t size = 256;
46 data = cache.newCachedData(size); 46 data = cache.newCachedData(size);
47 memset(data->writable_data(), 0xff, size); 47 memset(data->writable_data(), 0xff, size);
48 mask.fBounds.setXYWH(0, 0, 100, 100); 48 mask.fBounds.setXYWH(0, 0, 100, 100);
49 mask.fRowBytes = 100; 49 mask.fRowBytes = 100;
50 mask.fFormat = SkMask::kBW_Format; 50 mask.fFormat = SkMask::kBW_Format;
51 SkMaskCache::Add(sigma, rrect, style, quality, mask, data, &cache); 51 SkMaskCache::Add(sigma, style, quality, rrect, mask, data, &cache);
52 check_data(reporter, data, 2, kInCache, kLocked); 52 check_data(reporter, data, 2, kInCache, kLocked);
53 53
54 data->unref(); 54 data->unref();
55 check_data(reporter, data, 1, kInCache, kUnlocked); 55 check_data(reporter, data, 1, kInCache, kUnlocked);
56 56
57 sk_bzero(&mask, sizeof(mask)); 57 sk_bzero(&mask, sizeof(mask));
58 data = SkMaskCache::FindAndRef(sigma, rrect, style, quality, &mask, &cache); 58 data = SkMaskCache::FindAndRef(sigma, style, quality, rrect, &mask, &cache);
59 REPORTER_ASSERT(reporter, data); 59 REPORTER_ASSERT(reporter, data);
60 REPORTER_ASSERT(reporter, data->size() == size); 60 REPORTER_ASSERT(reporter, data->size() == size);
61 REPORTER_ASSERT(reporter, mask.fBounds.top() == 0 && mask.fBounds.bottom() = = 100); 61 REPORTER_ASSERT(reporter, mask.fBounds.top() == 0 && mask.fBounds.bottom() = = 100);
62 REPORTER_ASSERT(reporter, data->data() == (const void*)mask.fImage); 62 REPORTER_ASSERT(reporter, data->data() == (const void*)mask.fImage);
63 check_data(reporter, data, 2, kInCache, kLocked); 63 check_data(reporter, data, 2, kInCache, kLocked);
64 64
65 cache.purgeAll(); 65 cache.purgeAll();
66 check_data(reporter, data, 1, kNotInCache, kLocked); 66 check_data(reporter, data, 1, kNotInCache, kLocked);
67 data->unref(); 67 data->unref();
68 } 68 }
69 69
70 DEF_TEST(RectsMaskCache, reporter) { 70 DEF_TEST(RectsMaskCache, reporter) {
71 SkResourceCache cache(1024); 71 SkResourceCache cache(1024);
72 72
73 SkScalar sigma = 0.8f; 73 SkScalar sigma = 0.8f;
74 SkRect rect = SkRect::MakeWH(100, 100); 74 SkRect rect = SkRect::MakeWH(100, 100);
75 SkRect rects[2] = {rect}; 75 SkRect rects[2] = {rect};
76 SkBlurStyle style = kNormal_SkBlurStyle; 76 SkBlurStyle style = kNormal_SkBlurStyle;
77 SkBlurQuality quality = kLow_SkBlurQuality;
77 SkMask mask; 78 SkMask mask;
78 79
79 SkCachedData* data = SkMaskCache::FindAndRef(sigma, rects, 1, style, &mask, &cache); 80 SkCachedData* data = SkMaskCache::FindAndRef(sigma, style, quality, rects, 1 , &mask, &cache);
80 REPORTER_ASSERT(reporter, NULL == data); 81 REPORTER_ASSERT(reporter, NULL == data);
81 82
82 size_t size = 256; 83 size_t size = 256;
83 data = cache.newCachedData(size); 84 data = cache.newCachedData(size);
84 memset(data->writable_data(), 0xff, size); 85 memset(data->writable_data(), 0xff, size);
85 mask.fBounds.setXYWH(0, 0, 100, 100); 86 mask.fBounds.setXYWH(0, 0, 100, 100);
86 mask.fRowBytes = 100; 87 mask.fRowBytes = 100;
87 mask.fFormat = SkMask::kBW_Format; 88 mask.fFormat = SkMask::kBW_Format;
88 SkMaskCache::Add(sigma, rects, 1, style, mask, data, &cache); 89 SkMaskCache::Add(sigma, style, quality, rects, 1, mask, data, &cache);
89 check_data(reporter, data, 2, kInCache, kLocked); 90 check_data(reporter, data, 2, kInCache, kLocked);
90 91
91 data->unref(); 92 data->unref();
92 check_data(reporter, data, 1, kInCache, kUnlocked); 93 check_data(reporter, data, 1, kInCache, kUnlocked);
93 94
94 sk_bzero(&mask, sizeof(mask)); 95 sk_bzero(&mask, sizeof(mask));
95 data = SkMaskCache::FindAndRef(sigma, rects, 1, style, &mask, &cache); 96 data = SkMaskCache::FindAndRef(sigma, style, quality, rects, 1, &mask, &cach e);
96 REPORTER_ASSERT(reporter, data); 97 REPORTER_ASSERT(reporter, data);
97 REPORTER_ASSERT(reporter, data->size() == size); 98 REPORTER_ASSERT(reporter, data->size() == size);
98 REPORTER_ASSERT(reporter, mask.fBounds.top() == 0 && mask.fBounds.bottom() = = 100); 99 REPORTER_ASSERT(reporter, mask.fBounds.top() == 0 && mask.fBounds.bottom() = = 100);
99 REPORTER_ASSERT(reporter, data->data() == (const void*)mask.fImage); 100 REPORTER_ASSERT(reporter, data->data() == (const void*)mask.fImage);
100 check_data(reporter, data, 2, kInCache, kLocked); 101 check_data(reporter, data, 2, kInCache, kLocked);
101 102
102 cache.purgeAll(); 103 cache.purgeAll();
103 check_data(reporter, data, 1, kNotInCache, kLocked); 104 check_data(reporter, data, 1, kNotInCache, kLocked);
104 data->unref(); 105 data->unref();
105 } 106 }
OLDNEW
« no previous file with comments | « src/effects/SkBlurMaskFilter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698