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

Side by Side Diff: src/gpu/GrAtlasTextBlob.cpp

Issue 1241263003: adding assert to GrAtlasTextContext (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | src/gpu/GrAtlasTextContext.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 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 "GrAtlasTextBlob.h" 8 #include "GrAtlasTextBlob.h"
9 9
10 #ifdef CACHE_SANITY_CHECK 10 #ifdef CACHE_SANITY_CHECK
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 SkASSERT(!rRun.fStrike.get()); 50 SkASSERT(!rRun.fStrike.get());
51 } 51 }
52 52
53 if (lRun.fTypeface.get()) { 53 if (lRun.fTypeface.get()) {
54 SkASSERT(rRun.fTypeface.get()); 54 SkASSERT(rRun.fTypeface.get());
55 SkASSERT(SkTypeface::Equal(lRun.fTypeface, rRun.fTypeface)); 55 SkASSERT(SkTypeface::Equal(lRun.fTypeface, rRun.fTypeface));
56 } else { 56 } else {
57 SkASSERT(!rRun.fTypeface.get()); 57 SkASSERT(!rRun.fTypeface.get());
58 } 58 }
59 59
60 // TODO BOUNDS ARE ALL MESSED UP 60 // We offset bounds right before flush time so they will not be correct here
61 //SkASSERT(lRun.fVertexBounds == rRun.fVertexBounds); 61 //SkASSERT(lRun.fVertexBounds == rRun.fVertexBounds);
62 62
63 SkASSERT(lRun.fDescriptor.getDesc()); 63 SkASSERT(lRun.fDescriptor.getDesc());
64 SkASSERT(rRun.fDescriptor.getDesc()); 64 SkASSERT(rRun.fDescriptor.getDesc());
65 SkASSERT(lRun.fDescriptor.getDesc()->equals(*rRun.fDescriptor.getDesc()) ); 65 SkASSERT(lRun.fDescriptor.getDesc()->equals(*rRun.fDescriptor.getDesc()) );
66 66
67 if (lRun.fOverrideDescriptor.get()) { 67 if (lRun.fOverrideDescriptor.get()) {
68 SkASSERT(lRun.fOverrideDescriptor->getDesc()); 68 SkASSERT(lRun.fOverrideDescriptor->getDesc());
69 SkASSERT(rRun.fOverrideDescriptor.get() && rRun.fOverrideDescriptor- >getDesc());; 69 SkASSERT(rRun.fOverrideDescriptor.get() && rRun.fOverrideDescriptor- >getDesc());;
70 SkASSERT(lRun.fOverrideDescriptor->getDesc()->equals( 70 SkASSERT(lRun.fOverrideDescriptor->getDesc()->equals(
(...skipping 29 matching lines...) Expand all
100 rSubRun.fBulkUseToken.fPlotAlreadyUpdated); 100 rSubRun.fBulkUseToken.fPlotAlreadyUpdated);
101 for (int k = 0; k < lSubRun.fBulkUseToken.fPlotsToUpdate.count(); k+ +) { 101 for (int k = 0; k < lSubRun.fBulkUseToken.fPlotsToUpdate.count(); k+ +) {
102 SkASSERT(lSubRun.fBulkUseToken.fPlotsToUpdate[k] == 102 SkASSERT(lSubRun.fBulkUseToken.fPlotsToUpdate[k] ==
103 rSubRun.fBulkUseToken.fPlotsToUpdate[k]); 103 rSubRun.fBulkUseToken.fPlotsToUpdate[k]);
104 }*/ 104 }*/
105 } 105 }
106 } 106 }
107 } 107 }
108 108
109 #endif 109 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrAtlasTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698