| Index: src/gpu/GrDrawContext.cpp
|
| diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
|
| index 8978c6b54238b898e8c0ce53e5aa6dd9065cf609..492d425dada71242c6a941fa82ebe57adc9a636e 100644
|
| --- a/src/gpu/GrDrawContext.cpp
|
| +++ b/src/gpu/GrDrawContext.cpp
|
| @@ -6,7 +6,6 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -#include "GrAtlasTextContext.h"
|
| #include "GrBatchTest.h"
|
| #include "GrColor.h"
|
| #include "GrDrawContext.h"
|
| @@ -16,7 +15,6 @@
|
| #include "GrRenderTarget.h"
|
| #include "GrRenderTargetPriv.h"
|
| #include "GrResourceProvider.h"
|
| -#include "GrStencilAndCoverTextContext.h"
|
| #include "SkSurfacePriv.h"
|
|
|
| #include "batches/GrBatch.h"
|
| @@ -25,6 +23,9 @@
|
| #include "batches/GrRectBatchFactory.h"
|
| #include "batches/GrNinePatch.h" // TODO Factory
|
|
|
| +#include "text/GrAtlasTextContext.h"
|
| +#include "text/GrStencilAndCoverTextContext.h"
|
| +
|
| #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingManager->getContext())
|
| #define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; }
|
| #define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->abandoned()) { return false; }
|
|
|