robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2012 Google Inc. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license that can be |
| 5 | * found in the LICENSE file. |
| 6 | */ |
| 7 | |
reed | f037e0b | 2014-10-30 11:34:15 -0700 | [diff] [blame] | 8 | #include "Test.h" |
| 9 | |
bsalomon@google.com | cf8fb1f | 2012-08-02 14:03:32 +0000 | [diff] [blame] | 10 | // This test is specific to the GPU backend. |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 11 | #include "GrContext.h" |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 12 | #include "GrContextPriv.h" |
Robert Phillips | 0bd24dc | 2018-01-16 08:06:32 -0500 | [diff] [blame] | 13 | #include "GrProxyProvider.h" |
Brian Osman | 32342f0 | 2017-03-04 08:12:46 -0500 | [diff] [blame] | 14 | #include "GrResourceProvider.h" |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 15 | #include "GrSurfaceContext.h" |
| 16 | #include "GrSurfaceProxy.h" |
Robert Phillips | 009e9af | 2017-06-15 14:01:04 -0400 | [diff] [blame] | 17 | #include "GrTextureProxy.h" |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 18 | #include "ProxyUtils.h" |
robertphillips | 7715e06 | 2016-04-22 10:57:16 -0700 | [diff] [blame] | 19 | #include "SkCanvas.h" |
| 20 | #include "SkSurface.h" |
Hal Canary | c640d0d | 2018-06-13 09:59:02 -0400 | [diff] [blame] | 21 | #include "SkTo.h" |
robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 22 | |
bsalomon | f46a124 | 2015-12-15 12:37:38 -0800 | [diff] [blame] | 23 | // This was made indivisible by 4 to ensure we test setting GL_PACK_ALIGNMENT properly. |
| 24 | static const int X_SIZE = 13; |
| 25 | static const int Y_SIZE = 13; |
robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 26 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 27 | static void validate_alpha_data(skiatest::Reporter* reporter, int w, int h, const uint8_t* actual, |
Brian Osman | 10fc6fd | 2018-03-02 11:01:10 -0500 | [diff] [blame] | 28 | size_t actualRowBytes, const uint8_t* expected, SkString extraMsg, |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 29 | GrColorType colorType) { |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 30 | for (int y = 0; y < h; ++y) { |
| 31 | for (int x = 0; x < w; ++x) { |
| 32 | uint8_t a = actual[y * actualRowBytes + x]; |
| 33 | uint8_t e = expected[y * w + x]; |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 34 | if (GrColorType::kRGBA_1010102 == colorType) { |
Brian Osman | 10fc6fd | 2018-03-02 11:01:10 -0500 | [diff] [blame] | 35 | // This config only preserves two bits of alpha |
| 36 | a >>= 6; |
| 37 | e >>= 6; |
| 38 | } |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 39 | if (e != a) { |
| 40 | ERRORF(reporter, |
| 41 | "Failed alpha readback. Expected: 0x%02x, Got: 0x%02x at (%d,%d), %s", |
| 42 | e, a, x, y, extraMsg.c_str()); |
| 43 | return; |
| 44 | } |
| 45 | } |
| 46 | } |
| 47 | } |
robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 48 | |
egdaniel | ab527a5 | 2016-06-28 08:07:26 -0700 | [diff] [blame] | 49 | DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) { |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 50 | GrContext* context = ctxInfo.grContext(); |
Robert Phillips | 1afd4cd | 2018-01-08 13:40:32 -0500 | [diff] [blame] | 51 | GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); |
| 52 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 53 | unsigned char alphaData[X_SIZE * Y_SIZE]; |
robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 54 | |
robertphillips | df082c5 | 2016-04-19 08:32:40 -0700 | [diff] [blame] | 55 | static const int kClearValue = 0x2; |
| 56 | |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 57 | bool match; |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 58 | static const size_t kRowBytes[] = {0, X_SIZE, X_SIZE + 1, 2 * X_SIZE - 1}; |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 59 | { |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 60 | GrSurfaceDesc desc; |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 61 | desc.fFlags = kNone_GrSurfaceFlags; |
| 62 | desc.fConfig = kAlpha_8_GrPixelConfig; // it is a single channel texture |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 63 | desc.fWidth = X_SIZE; |
| 64 | desc.fHeight = Y_SIZE; |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 65 | |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 66 | // We are initializing the texture with zeros here |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 67 | memset(alphaData, 0, X_SIZE * Y_SIZE); |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 68 | |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 69 | sk_sp<GrTextureProxy> proxy = |
| 70 | proxyProvider->createTextureProxy(desc, SkBudgeted::kNo, alphaData, 0); |
Robert Phillips | 2f49314 | 2017-03-02 18:18:38 -0500 | [diff] [blame] | 71 | if (!proxy) { |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 72 | ERRORF(reporter, "Could not create alpha texture."); |
| 73 | return; |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 74 | } |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 75 | sk_sp<GrSurfaceContext> sContext(context->contextPriv().makeWrappedSurfaceContext( |
Robert Phillips | d5f9cdd | 2018-01-31 09:29:48 -0500 | [diff] [blame] | 76 | std::move(proxy))); |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 77 | |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 78 | const SkImageInfo ii = SkImageInfo::MakeA8(X_SIZE, Y_SIZE); |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 79 | sk_sp<SkSurface> surf(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, ii)); |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 80 | |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 81 | // create a distinctive texture |
| 82 | for (int y = 0; y < Y_SIZE; ++y) { |
| 83 | for (int x = 0; x < X_SIZE; ++x) { |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 84 | alphaData[y * X_SIZE + x] = y*X_SIZE+x; |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 85 | } |
| 86 | } |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 87 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 88 | for (auto rowBytes : kRowBytes) { |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 89 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 90 | // upload the texture (do per-rowbytes iteration because we may overwrite below). |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 91 | bool result = sContext->writePixels(ii, alphaData, 0, 0, 0); |
Brian Salomon | 1c80e99 | 2018-01-29 09:50:47 -0500 | [diff] [blame] | 92 | REPORTER_ASSERT(reporter, result, "Initial A8 writePixels failed"); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 93 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 94 | size_t nonZeroRowBytes = rowBytes ? rowBytes : X_SIZE; |
Brian Osman | 10fc6fd | 2018-03-02 11:01:10 -0500 | [diff] [blame] | 95 | size_t bufLen = nonZeroRowBytes * Y_SIZE; |
| 96 | std::unique_ptr<uint8_t[]> readback(new uint8_t[bufLen]); |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 97 | // clear readback to something non-zero so we can detect readback failures |
Brian Osman | 10fc6fd | 2018-03-02 11:01:10 -0500 | [diff] [blame] | 98 | memset(readback.get(), kClearValue, bufLen); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 99 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 100 | // read the texture back |
Robert Phillips | c949ce9 | 2017-01-19 16:59:04 -0500 | [diff] [blame] | 101 | result = sContext->readPixels(ii, readback.get(), rowBytes, 0, 0); |
Brian Salomon | 19eaf2d | 2018-03-19 16:06:44 -0400 | [diff] [blame] | 102 | // We don't require reading from kAlpha_8 to be supported. TODO: At least make this work |
| 103 | // when kAlpha_8 is renderable. |
| 104 | if (!result) { |
| 105 | continue; |
| 106 | } |
Brian Salomon | 1c80e99 | 2018-01-29 09:50:47 -0500 | [diff] [blame] | 107 | REPORTER_ASSERT(reporter, result, "Initial A8 readPixels failed"); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 108 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 109 | // make sure the original & read back versions match |
| 110 | SkString msg; |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 111 | msg.printf("rb:%d A8", SkToU32(rowBytes)); |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 112 | validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes, |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 113 | alphaData, msg, GrColorType::kAlpha_8); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 114 | |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 115 | // Now try writing to a single channel surface (if we could create one). |
| 116 | if (surf) { |
robertphillips | 7715e06 | 2016-04-22 10:57:16 -0700 | [diff] [blame] | 117 | SkCanvas* canvas = surf->getCanvas(); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 118 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 119 | SkPaint paint; |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 120 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 121 | const SkRect rect = SkRect::MakeLTRB(-10, -10, X_SIZE + 10, Y_SIZE + 10); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 122 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 123 | paint.setColor(SK_ColorWHITE); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 124 | |
robertphillips | 7715e06 | 2016-04-22 10:57:16 -0700 | [diff] [blame] | 125 | canvas->drawRect(rect, paint); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 126 | |
Brian Osman | 10fc6fd | 2018-03-02 11:01:10 -0500 | [diff] [blame] | 127 | // Workaround for a bug in old GCC/glibc used in our Chromecast toolchain: |
| 128 | // error: call to '__warn_memset_zero_len' declared with attribute warning: |
| 129 | // memset used with constant zero length parameter; this could be due |
| 130 | // to transposed parameters |
| 131 | // See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294 |
| 132 | if (bufLen > 0) { |
| 133 | memset(readback.get(), kClearValue, bufLen); |
| 134 | } |
robertphillips | 7e92276 | 2016-07-26 11:38:17 -0700 | [diff] [blame] | 135 | result = surf->readPixels(ii, readback.get(), nonZeroRowBytes, 0, 0); |
Brian Salomon | 1c80e99 | 2018-01-29 09:50:47 -0500 | [diff] [blame] | 136 | REPORTER_ASSERT(reporter, result, "A8 readPixels after clear failed"); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 137 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 138 | match = true; |
| 139 | for (int y = 0; y < Y_SIZE && match; ++y) { |
| 140 | for (int x = 0; x < X_SIZE && match; ++x) { |
| 141 | uint8_t rbValue = readback.get()[y * nonZeroRowBytes + x]; |
| 142 | if (0xFF != rbValue) { |
| 143 | ERRORF(reporter, |
| 144 | "Failed alpha readback after clear. Expected: 0xFF, Got: 0x%02x" |
Brian Salomon | 2ea6ff7 | 2016-02-02 11:34:46 -0500 | [diff] [blame] | 145 | " at (%d,%d), rb:%d", rbValue, x, y, SkToU32(rowBytes)); |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 146 | match = false; |
| 147 | } |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 148 | } |
| 149 | } |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 150 | } |
| 151 | } |
| 152 | } |
| 153 | |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 154 | static constexpr struct { |
| 155 | GrColorType fColorType; |
| 156 | GrSRGBEncoded fSRGBEncoded; |
| 157 | } kInfos[] = { |
| 158 | {GrColorType::kRGBA_8888, GrSRGBEncoded::kNo}, |
| 159 | {GrColorType::kBGRA_8888, GrSRGBEncoded::kNo}, |
| 160 | {GrColorType::kRGBA_8888, GrSRGBEncoded::kYes}, |
| 161 | {GrColorType::kRGBA_1010102, GrSRGBEncoded::kNo}, |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 162 | }; |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 163 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 164 | for (int y = 0; y < Y_SIZE; ++y) { |
| 165 | for (int x = 0; x < X_SIZE; ++x) { |
| 166 | alphaData[y * X_SIZE + x] = y*X_SIZE+x; |
| 167 | } |
| 168 | } |
| 169 | |
Robert Phillips | bab2dbb | 2017-04-17 07:43:27 -0400 | [diff] [blame] | 170 | const SkImageInfo dstInfo = SkImageInfo::Make(X_SIZE, Y_SIZE, |
| 171 | kAlpha_8_SkColorType, |
| 172 | kPremul_SkAlphaType); |
| 173 | |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 174 | // Attempt to read back just alpha from a RGBA/BGRA texture. Once with a texture-only src and |
| 175 | // once with a render target. |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 176 | for (auto info : kInfos) { |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 177 | for (int rt = 0; rt < 2; ++rt) { |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 178 | uint32_t rgbaData[X_SIZE * Y_SIZE]; |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 179 | // Make the alpha channel of the rgba texture come from alphaData. |
| 180 | for (int y = 0; y < Y_SIZE; ++y) { |
| 181 | for (int x = 0; x < X_SIZE; ++x) { |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 182 | rgbaData[y * X_SIZE + x] = GrColorPackRGBA(6, 7, 8, alphaData[y * X_SIZE + x]); |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 183 | } |
| 184 | } |
Robert Phillips | 0bd24dc | 2018-01-16 08:06:32 -0500 | [diff] [blame] | 185 | |
Brian Salomon | 2a4f983 | 2018-03-03 22:43:43 -0500 | [diff] [blame] | 186 | auto origin = rt ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin; |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 187 | auto proxy = sk_gpu_test::MakeTextureProxyFromData(context, rt, X_SIZE, Y_SIZE, |
| 188 | info.fColorType, info.fSRGBEncoded, |
| 189 | origin, rgbaData, 0); |
Robert Phillips | e78b725 | 2017-04-06 07:59:41 -0400 | [diff] [blame] | 190 | if (!proxy) { |
bsalomon | e957331 | 2016-01-25 14:33:25 -0800 | [diff] [blame] | 191 | continue; |
| 192 | } |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 193 | |
Brian Salomon | 366093f | 2018-02-13 09:25:22 -0500 | [diff] [blame] | 194 | sk_sp<SkColorSpace> colorSpace; |
| 195 | if (GrPixelConfigIsSRGB(proxy->config())) { |
| 196 | colorSpace = SkColorSpace::MakeSRGB(); |
| 197 | } |
Robert Phillips | bab2dbb | 2017-04-17 07:43:27 -0400 | [diff] [blame] | 198 | sk_sp<GrSurfaceContext> sContext = context->contextPriv().makeWrappedSurfaceContext( |
Brian Salomon | 366093f | 2018-02-13 09:25:22 -0500 | [diff] [blame] | 199 | std::move(proxy), std::move(colorSpace)); |
Robert Phillips | bab2dbb | 2017-04-17 07:43:27 -0400 | [diff] [blame] | 200 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 201 | for (auto rowBytes : kRowBytes) { |
| 202 | size_t nonZeroRowBytes = rowBytes ? rowBytes : X_SIZE; |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 203 | |
Ben Wagner | 7ecc596 | 2016-11-02 17:07:33 -0400 | [diff] [blame] | 204 | std::unique_ptr<uint8_t[]> readback(new uint8_t[nonZeroRowBytes * Y_SIZE]); |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 205 | // Clear so we don't accidentally see values from previous iteration. |
robertphillips | df082c5 | 2016-04-19 08:32:40 -0700 | [diff] [blame] | 206 | memset(readback.get(), kClearValue, nonZeroRowBytes * Y_SIZE); |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 207 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 208 | // read the texture back |
Robert Phillips | bab2dbb | 2017-04-17 07:43:27 -0400 | [diff] [blame] | 209 | bool result = sContext->readPixels(dstInfo, readback.get(), rowBytes, 0, 0); |
Brian Salomon | 1c80e99 | 2018-01-29 09:50:47 -0500 | [diff] [blame] | 210 | REPORTER_ASSERT(reporter, result, "8888 readPixels failed"); |
bsalomon | 23e5666 | 2016-01-14 07:19:47 -0800 | [diff] [blame] | 211 | |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 212 | // make sure the original & read back versions match |
| 213 | SkString msg; |
robertphillips | df082c5 | 2016-04-19 08:32:40 -0700 | [diff] [blame] | 214 | msg.printf("rt:%d, rb:%d 8888", rt, SkToU32(rowBytes)); |
bsalomon | 9d02b26 | 2016-02-01 12:49:30 -0800 | [diff] [blame] | 215 | validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes, |
Brian Salomon | 58389b9 | 2018-03-07 13:01:25 -0500 | [diff] [blame] | 216 | alphaData, msg, info.fColorType); |
kkinnunen | 1530283 | 2015-12-01 04:35:26 -0800 | [diff] [blame] | 217 | } |
| 218 | } |
| 219 | } |
robertphillips@google.com | 6995068 | 2012-04-06 18:06:10 +0000 | [diff] [blame] | 220 | } |