| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 Google Inc. | 2  * Copyright 2015 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 <functional> | 8 #include <functional> | 
| 9 #include <initializer_list> | 9 #include <initializer_list> | 
| 10 #include "DMGpuSupport.h" | 10 #include "DMGpuSupport.h" | 
| 11 | 11 | 
| 12 #include "SkAutoPixmapStorage.h" | 12 #include "SkAutoPixmapStorage.h" | 
| 13 #include "SkBitmap.h" | 13 #include "SkBitmap.h" | 
| 14 #include "SkCanvas.h" | 14 #include "SkCanvas.h" | 
| 15 #include "SkData.h" | 15 #include "SkData.h" | 
| 16 #include "SkDevice.h" | 16 #include "SkDevice.h" | 
| 17 #include "SkImageEncoder.h" | 17 #include "SkImageEncoder.h" | 
| 18 #include "SkImageGenerator.h" | 18 #include "SkImageGenerator.h" | 
| 19 #include "SkImage_Base.h" | 19 #include "SkImage_Base.h" | 
| 20 #include "SkPicture.h" | 20 #include "SkPicture.h" | 
| 21 #include "SkPictureRecorder.h" | 21 #include "SkPictureRecorder.h" | 
| 22 #include "SkPixelSerializer.h" | 22 #include "SkPixelSerializer.h" | 
| 23 #include "SkRRect.h" | 23 #include "SkRRect.h" | 
| 24 #include "SkStream.h" | 24 #include "SkStream.h" | 
| 25 #include "SkSurface.h" | 25 #include "SkSurface.h" | 
| 26 #include "SkUtils.h" | 26 #include "SkUtils.h" | 
| 27 #include "Test.h" | 27 #include "Test.h" | 
| 28 | 28 | 
|  | 29 using sk_gpu_test::GrContextFactory; | 
|  | 30 | 
| 29 static void assert_equal(skiatest::Reporter* reporter, SkImage* a, const SkIRect
     * subsetA, | 31 static void assert_equal(skiatest::Reporter* reporter, SkImage* a, const SkIRect
     * subsetA, | 
| 30                          SkImage* b) { | 32                          SkImage* b) { | 
| 31     const int widthA = subsetA ? subsetA->width() : a->width(); | 33     const int widthA = subsetA ? subsetA->width() : a->width(); | 
| 32     const int heightA = subsetA ? subsetA->height() : a->height(); | 34     const int heightA = subsetA ? subsetA->height() : a->height(); | 
| 33 | 35 | 
| 34     REPORTER_ASSERT(reporter, widthA == b->width()); | 36     REPORTER_ASSERT(reporter, widthA == b->width()); | 
| 35     REPORTER_ASSERT(reporter, heightA == b->height()); | 37     REPORTER_ASSERT(reporter, heightA == b->height()); | 
| 36 | 38 | 
| 37     // see https://bug.skia.org/3965 | 39     // see https://bug.skia.org/3965 | 
| 38     //REPORTER_ASSERT(reporter, a->isOpaque() == b->isOpaque()); | 40     //REPORTER_ASSERT(reporter, a->isOpaque() == b->isOpaque()); | 
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 883                         otherContextInfo.fGrContext, buffer, budgeted)); | 885                         otherContextInfo.fGrContext, buffer, budgeted)); | 
| 884                     REPORTER_ASSERT(reporter, !newImage2); | 886                     REPORTER_ASSERT(reporter, !newImage2); | 
| 885                     glContext->makeCurrent(); | 887                     glContext->makeCurrent(); | 
| 886                 } | 888                 } | 
| 887             } | 889             } | 
| 888             sk_free(buffer); | 890             sk_free(buffer); | 
| 889         } | 891         } | 
| 890     } | 892     } | 
| 891 } | 893 } | 
| 892 #endif | 894 #endif | 
| OLD | NEW | 
|---|