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

Side by Side Diff: tests/DeferredCanvasTest.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « tests/ClipStackTest.cpp ('k') | tests/DequeTest.cpp » ('j') | 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 2012 Google Inc. 2 * Copyright 2012 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 "../src/image/SkImagePriv.h" 8 #include "../src/image/SkImagePriv.h"
9 #include "../src/image/SkSurface_Base.h" 9 #include "../src/image/SkSurface_Base.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 return surface->getCanvas()->internal_private_accessTopLayerRenderTarget ()->asTexture(); 674 return surface->getCanvas()->internal_private_accessTopLayerRenderTarget ()->asTexture();
675 } else 675 } else
676 #endif 676 #endif
677 { 677 {
678 return surface->peekPixels(NULL, NULL); 678 return surface->peekPixels(NULL, NULL);
679 } 679 }
680 } 680 }
681 681
682 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFac tory* factory) { 682 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFac tory* factory) {
683 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); 683 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10);
684 bool useGpu = NULL != factory; 684 bool useGpu = SkToBool(factory);
685 int cnt; 685 int cnt;
686 #if SK_SUPPORT_GPU 686 #if SK_SUPPORT_GPU
687 if (useGpu) { 687 if (useGpu) {
688 cnt = GrContextFactory::kGLContextTypeCnt; 688 cnt = GrContextFactory::kGLContextTypeCnt;
689 } else { 689 } else {
690 cnt = 1; 690 cnt = 1;
691 } 691 }
692 #else 692 #else
693 SkASSERT(!useGpu); 693 SkASSERT(!useGpu);
694 cnt = 1; 694 cnt = 1;
(...skipping 10 matching lines...) Expand all
705 if (NULL == context) { 705 if (NULL == context) {
706 return; 706 return;
707 } 707 }
708 708
709 surface = SkSurface::NewRenderTarget(context, imageSpec); 709 surface = SkSurface::NewRenderTarget(context, imageSpec);
710 } else 710 } else
711 #endif 711 #endif
712 { 712 {
713 surface = SkSurface::NewRaster(imageSpec); 713 surface = SkSurface::NewRaster(imageSpec);
714 } 714 }
715 SkASSERT(NULL != surface); 715 SkASSERT(surface);
716 SkAutoTUnref<SkSurface> aur(surface); 716 SkAutoTUnref<SkSurface> aur(surface);
717 SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface)) ; 717 SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface)) ;
718 718
719 SkImage* image1 = canvas->newImageSnapshot(); 719 SkImage* image1 = canvas->newImageSnapshot();
720 SkAutoTUnref<SkImage> aur_i1(image1); 720 SkAutoTUnref<SkImage> aur_i1(image1);
721 PixelPtr pixels1 = get_surface_ptr(surface, useGpu); 721 PixelPtr pixels1 = get_surface_ptr(surface, useGpu);
722 // The following clear would normally trigger a copy on write, but 722 // The following clear would normally trigger a copy on write, but
723 // it won't because rendering is deferred. 723 // it won't because rendering is deferred.
724 canvas->clear(SK_ColorBLACK); 724 canvas->clear(SK_ColorBLACK);
725 // Obtaining a snapshot directly from the surface (as opposed to the 725 // Obtaining a snapshot directly from the surface (as opposed to the
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 canvas->flush(); 757 canvas->flush();
758 PixelPtr pixels5 = get_surface_ptr(surface, useGpu); 758 PixelPtr pixels5 = get_surface_ptr(surface, useGpu);
759 REPORTER_ASSERT(reporter, pixels4 == pixels5); 759 REPORTER_ASSERT(reporter, pixels4 == pixels5);
760 } 760 }
761 } 761 }
762 762
763 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContext Factory* factory) { 763 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContext Factory* factory) {
764 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10); 764 SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10);
765 SkSurface* surface; 765 SkSurface* surface;
766 SkSurface* alternateSurface; 766 SkSurface* alternateSurface;
767 bool useGpu = NULL != factory; 767 bool useGpu = SkToBool(factory);
768 int cnt; 768 int cnt;
769 #if SK_SUPPORT_GPU 769 #if SK_SUPPORT_GPU
770 if (useGpu) { 770 if (useGpu) {
771 cnt = GrContextFactory::kGLContextTypeCnt; 771 cnt = GrContextFactory::kGLContextTypeCnt;
772 } else { 772 } else {
773 cnt = 1; 773 cnt = 1;
774 } 774 }
775 #else 775 #else
776 SkASSERT(!useGpu); 776 SkASSERT(!useGpu);
777 cnt = 1; 777 cnt = 1;
(...skipping 11 matching lines...) Expand all
789 continue; 789 continue;
790 } 790 }
791 surface = SkSurface::NewRenderTarget(context, imageSpec); 791 surface = SkSurface::NewRenderTarget(context, imageSpec);
792 alternateSurface = SkSurface::NewRenderTarget(context, imageSpec); 792 alternateSurface = SkSurface::NewRenderTarget(context, imageSpec);
793 } else 793 } else
794 #endif 794 #endif
795 { 795 {
796 surface = SkSurface::NewRaster(imageSpec); 796 surface = SkSurface::NewRaster(imageSpec);
797 alternateSurface = SkSurface::NewRaster(imageSpec); 797 alternateSurface = SkSurface::NewRaster(imageSpec);
798 } 798 }
799 SkASSERT(NULL != surface); 799 SkASSERT(surface);
800 SkASSERT(NULL != alternateSurface); 800 SkASSERT(alternateSurface);
801 SkAutoTUnref<SkSurface> aur1(surface); 801 SkAutoTUnref<SkSurface> aur1(surface);
802 SkAutoTUnref<SkSurface> aur2(alternateSurface); 802 SkAutoTUnref<SkSurface> aur2(alternateSurface);
803 PixelPtr pixels1 = get_surface_ptr(surface, useGpu); 803 PixelPtr pixels1 = get_surface_ptr(surface, useGpu);
804 PixelPtr pixels2 = get_surface_ptr(alternateSurface, useGpu); 804 PixelPtr pixels2 = get_surface_ptr(alternateSurface, useGpu);
805 SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface)) ; 805 SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface)) ;
806 SkAutoTUnref<SkImage> image1(canvas->newImageSnapshot()); 806 SkAutoTUnref<SkImage> image1(canvas->newImageSnapshot());
807 canvas->setSurface(alternateSurface); 807 canvas->setSurface(alternateSurface);
808 SkAutoTUnref<SkImage> image2(canvas->newImageSnapshot()); 808 SkAutoTUnref<SkImage> image2(canvas->newImageSnapshot());
809 REPORTER_ASSERT(reporter, image1->uniqueID() != image2->uniqueID()); 809 REPORTER_ASSERT(reporter, image1->uniqueID() != image2->uniqueID());
810 // Verify that none of the above operations triggered a surface copy on write. 810 // Verify that none of the above operations triggered a surface copy on write.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 TestDeferredCanvasSurface(reporter, NULL); 853 TestDeferredCanvasSurface(reporter, NULL);
854 TestDeferredCanvasSetSurface(reporter, NULL); 854 TestDeferredCanvasSetSurface(reporter, NULL);
855 } 855 }
856 856
857 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { 857 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
858 if (factory != NULL) { 858 if (factory != NULL) {
859 TestDeferredCanvasSurface(reporter, factory); 859 TestDeferredCanvasSurface(reporter, factory);
860 TestDeferredCanvasSetSurface(reporter, factory); 860 TestDeferredCanvasSetSurface(reporter, factory);
861 } 861 }
862 } 862 }
OLDNEW
« no previous file with comments | « tests/ClipStackTest.cpp ('k') | tests/DequeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698