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

Side by Side Diff: tests/SurfaceTest.cpp

Issue 63543005: Fix crash in tests on valgrind bot (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 /* 2 /*
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkCanvas.h" 8 #include "SkCanvas.h"
9 #include "SkRRect.h" 9 #include "SkRRect.h"
10 #include "SkSurface.h" 10 #include "SkSurface.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 TestSurfaceCopyOnWrite(reporter, kPicture_SurfaceType, NULL); 236 TestSurfaceCopyOnWrite(reporter, kPicture_SurfaceType, NULL);
237 TestSurfaceWritableAfterSnapshotRelease(reporter, kRaster_SurfaceType, NULL) ; 237 TestSurfaceWritableAfterSnapshotRelease(reporter, kRaster_SurfaceType, NULL) ;
238 TestSurfaceWritableAfterSnapshotRelease(reporter, kPicture_SurfaceType, NULL ); 238 TestSurfaceWritableAfterSnapshotRelease(reporter, kPicture_SurfaceType, NULL );
239 TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kDiscard _ContentChangeMode); 239 TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kDiscard _ContentChangeMode);
240 TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kRetain_ ContentChangeMode); 240 TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kRetain_ ContentChangeMode);
241 #if SK_SUPPORT_GPU 241 #if SK_SUPPORT_GPU
242 TestGetTexture(reporter, kRaster_SurfaceType, NULL); 242 TestGetTexture(reporter, kRaster_SurfaceType, NULL);
243 TestGetTexture(reporter, kPicture_SurfaceType, NULL); 243 TestGetTexture(reporter, kPicture_SurfaceType, NULL);
244 if (NULL != factory) { 244 if (NULL != factory) {
245 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e); 245 GrContext* context = factory->get(GrContextFactory::kNative_GLContextTyp e);
246 Test_crbug263329(reporter, context); 246 if (NULL != context) {
247 TestSurfaceCopyOnWrite(reporter, kGpu_SurfaceType, context); 247 Test_crbug263329(reporter, context);
248 TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, cont ext); 248 TestSurfaceCopyOnWrite(reporter, kGpu_SurfaceType, context);
249 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kDis card_ContentChangeMode); 249 TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);
250 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kRet ain_ContentChangeMode); 250 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface:: kDiscard_ContentChangeMode);
251 TestGetTexture(reporter, kGpu_SurfaceType, context); 251 TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface:: kRetain_ContentChangeMode);
252 TestGetTexture(reporter, kGpu_SurfaceType, context);
253 }
252 } 254 }
253 #endif 255 #endif
254 } 256 }
255 257
256 #include "TestClassDef.h" 258 #include "TestClassDef.h"
257 DEFINE_GPUTESTCLASS("Surface", SurfaceTestClass, TestSurface) 259 DEFINE_GPUTESTCLASS("Surface", SurfaceTestClass, TestSurface)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698