| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2015 Google Inc. | 3  * Copyright 2015 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 | 8 | 
| 9 #include "GrAARectRenderer.h" | 9 #include "GrAARectRenderer.h" | 
| 10 #include "GrAtlasTextContext.h" | 10 #include "GrAtlasTextContext.h" | 
| 11 #include "GrBatch.h" |  | 
| 12 #include "GrBatchTest.h" | 11 #include "GrBatchTest.h" | 
| 13 #include "GrColor.h" | 12 #include "GrColor.h" | 
| 14 #include "GrDefaultGeoProcFactory.h" | 13 #include "GrDefaultGeoProcFactory.h" | 
| 15 #include "GrDrawContext.h" | 14 #include "GrDrawContext.h" | 
| 16 #include "GrOvalRenderer.h" | 15 #include "GrOvalRenderer.h" | 
| 17 #include "GrPathRenderer.h" | 16 #include "GrPathRenderer.h" | 
| 18 #include "GrRenderTarget.h" | 17 #include "GrRenderTarget.h" | 
| 19 #include "GrRenderTargetPriv.h" | 18 #include "GrRenderTargetPriv.h" | 
| 20 #include "GrStrokeRectBatch.h" |  | 
| 21 #include "GrStencilAndCoverTextContext.h" | 19 #include "GrStencilAndCoverTextContext.h" | 
| 22 | 20 | 
|  | 21 #include "batches/GrBatch.h" | 
|  | 22 #include "batches/GrStrokeRectBatch.h" | 
|  | 23 | 
| 23 #include "SkGr.h" | 24 #include "SkGr.h" | 
| 24 #include "SkRSXform.h" | 25 #include "SkRSXform.h" | 
| 25 | 26 | 
| 26 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fContext) | 27 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fContext) | 
| 27 #define RETURN_IF_ABANDONED        if (!fDrawTarget) { return; } | 28 #define RETURN_IF_ABANDONED        if (!fDrawTarget) { return; } | 
| 28 #define RETURN_FALSE_IF_ABANDONED  if (!fDrawTarget) { return false; } | 29 #define RETURN_FALSE_IF_ABANDONED  if (!fDrawTarget) { return false; } | 
| 29 #define RETURN_NULL_IF_ABANDONED   if (!fDrawTarget) { return NULL; } | 30 #define RETURN_NULL_IF_ABANDONED   if (!fDrawTarget) { return NULL; } | 
| 30 | 31 | 
| 31 class AutoCheckFlush { | 32 class AutoCheckFlush { | 
| 32 public: | 33 public: | 
| (...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1378     return DrawVerticesBatch::Create(geometry, type, viewMatrix, | 1379     return DrawVerticesBatch::Create(geometry, type, viewMatrix, | 
| 1379                                      positions.begin(), vertexCount, | 1380                                      positions.begin(), vertexCount, | 
| 1380                                      indices.begin(), hasIndices ? vertexCount :
       0, | 1381                                      indices.begin(), hasIndices ? vertexCount :
       0, | 
| 1381                                      colors.begin(), | 1382                                      colors.begin(), | 
| 1382                                      texCoords.begin(), | 1383                                      texCoords.begin(), | 
| 1383                                      bounds); | 1384                                      bounds); | 
| 1384 } | 1385 } | 
| 1385 | 1386 | 
| 1386 #endif | 1387 #endif | 
| 1387 | 1388 | 
| OLD | NEW | 
|---|