| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 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 "SkBitmapDevice.h" | 8 #include "SkBitmapDevice.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkConfig8888.h" | 10 #include "SkConfig8888.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 if (0 == dtype) { | 80 if (0 == dtype) { |
| 81 device.reset(SkBitmapDevice::Create(info, props)); | 81 device.reset(SkBitmapDevice::Create(info, props)); |
| 82 } else { | 82 } else { |
| 83 #if SK_SUPPORT_GPU | 83 #if SK_SUPPORT_GPU |
| 84 GrContextFactory::GLContextType type = | 84 GrContextFactory::GLContextType type = |
| 85 static_cast<GrContextFactory::GLContextType>(glCtxType); | 85 static_cast<GrContextFactory::GLContextType>(glCtxType); |
| 86 if (!GrContextFactory::IsRenderingGLContext(type)) { | 86 if (!GrContextFactory::IsRenderingGLContext(type)) { |
| 87 continue; | 87 continue; |
| 88 } | 88 } |
| 89 GrContext* ctx = factory->get(type); | 89 GrContext* ctx = factory->get(type); |
| 90 if (NULL == ctx) { | 90 if (nullptr == ctx) { |
| 91 continue; | 91 continue; |
| 92 } | 92 } |
| 93 device.reset(SkGpuDevice::Create(ctx, SkSurface::kNo_Budgeted, i
nfo, 0, &props, | 93 device.reset(SkGpuDevice::Create(ctx, SkSurface::kNo_Budgeted, i
nfo, 0, &props, |
| 94 SkGpuDevice::kUninit_InitConten
ts)); | 94 SkGpuDevice::kUninit_InitConten
ts)); |
| 95 #else | 95 #else |
| 96 continue; | 96 continue; |
| 97 #endif | 97 #endif |
| 98 } | 98 } |
| 99 SkCanvas canvas(device); | 99 SkCanvas canvas(device); |
| 100 | 100 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 125 if (pixels1[x] != pixels2[x]) { | 125 if (pixels1[x] != pixels2[x]) { |
| 126 SkDebugf("%x != %x, x = %d, y = %d\n", pixels1[x], p
ixels2[x], x, y); | 126 SkDebugf("%x != %x, x = %d, y = %d\n", pixels1[x], p
ixels2[x], x, y); |
| 127 } | 127 } |
| 128 REPORTER_ASSERT(reporter, success = pixels1[x] == pixels
2[x]); | 128 REPORTER_ASSERT(reporter, success = pixels1[x] == pixels
2[x]); |
| 129 } | 129 } |
| 130 } | 130 } |
| 131 } | 131 } |
| 132 } | 132 } |
| 133 } | 133 } |
| 134 } | 134 } |
| OLD | NEW |