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

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

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 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 | « src/gpu/GrPathRendering.cpp ('k') | src/gpu/GrPipelineBuilder.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 "GrPipeline.h" 8 #include "GrPipeline.h"
9 9
10 #include "GrCaps.h" 10 #include "GrCaps.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // null GrPipeline. 46 // null GrPipeline.
47 if (GrXferProcessor::kSkipDraw_OptFlag & optFlags) { 47 if (GrXferProcessor::kSkipDraw_OptFlag & optFlags) {
48 return nullptr; 48 return nullptr;
49 } 49 }
50 50
51 // No need to have an override color if it isn't even going to be used. 51 // No need to have an override color if it isn't even going to be used.
52 if (SkToBool(GrXferProcessor::kIgnoreColor_OptFlag & optFlags)) { 52 if (SkToBool(GrXferProcessor::kIgnoreColor_OptFlag & optFlags)) {
53 overrideColor = GrColor_ILLEGAL; 53 overrideColor = GrColor_ILLEGAL;
54 } 54 }
55 55
56 GrPipeline* pipeline = SkNEW_PLACEMENT(memory, GrPipeline); 56 GrPipeline* pipeline = new (memory) GrPipeline;
57 pipeline->fXferProcessor.reset(xferProcessor.get()); 57 pipeline->fXferProcessor.reset(xferProcessor.get());
58 58
59 pipeline->fRenderTarget.reset(builder.fRenderTarget.get()); 59 pipeline->fRenderTarget.reset(builder.fRenderTarget.get());
60 SkASSERT(pipeline->fRenderTarget); 60 SkASSERT(pipeline->fRenderTarget);
61 pipeline->fScissorState = *args.fScissor; 61 pipeline->fScissorState = *args.fScissor;
62 pipeline->fStencilSettings = builder.getStencil(); 62 pipeline->fStencilSettings = builder.getStencil();
63 pipeline->fDrawFace = builder.getDrawFace(); 63 pipeline->fDrawFace = builder.getDrawFace();
64 64
65 pipeline->fFlags = 0; 65 pipeline->fFlags = 0;
66 if (builder.isHWAntialias()) { 66 if (builder.isHWAntialias()) {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 for (int i = 0; i < a.numFragmentStages(); i++) { 179 for (int i = 0; i < a.numFragmentStages(); i++) {
180 if (!a.getFragmentStage(i).processor()->isEqual(*b.getFragmentStage(i).p rocessor(), 180 if (!a.getFragmentStage(i).processor()->isEqual(*b.getFragmentStage(i).p rocessor(),
181 ignoreCoordTransform s)) { 181 ignoreCoordTransform s)) {
182 return false; 182 return false;
183 } 183 }
184 } 184 }
185 return true; 185 return true;
186 } 186 }
187 187
OLDNEW
« no previous file with comments | « src/gpu/GrPathRendering.cpp ('k') | src/gpu/GrPipelineBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698