diff options
author | Brian Salomon <bsalomon@google.com> | 2016-12-07 17:06:19 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-07 23:36:31 +0000 |
commit | 742e31de1599f3902810aecdf2e2e3eed3b40a09 (patch) | |
tree | bbac738ec7cecce88712ad2df993933c8888305e /src/gpu/GrDrawingManager.h | |
parent | 42521e891081a7a85db4390a457074054649f194 (diff) |
Rename GrBatchFlushState to GrOpFlushState
Change-Id: I1a8052c61d7624929caf45ba44e2a465cd0dc1c2
Reviewed-on: https://skia-review.googlesource.com/5649
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrDrawingManager.h')
-rw-r--r-- | src/gpu/GrDrawingManager.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h index 90a3064e24..9a05215f5b 100644 --- a/src/gpu/GrDrawingManager.h +++ b/src/gpu/GrDrawingManager.h @@ -8,14 +8,13 @@ #ifndef GrDrawingManager_DEFINED #define GrDrawingManager_DEFINED -#include "text/GrAtlasTextContext.h" -#include "GrBatchFlushState.h" -#include "GrPathRendererChain.h" +#include "GrOpFlushState.h" #include "GrPathRenderer.h" +#include "GrPathRendererChain.h" #include "GrRenderTargetOpList.h" #include "GrResourceCache.h" #include "SkTDArray.h" - +#include "text/GrAtlasTextContext.h" class GrContext; class GrRenderTargetContext; @@ -112,7 +111,7 @@ private: GrPathRendererChain* fPathRendererChain; GrSoftwarePathRenderer* fSoftwarePathRenderer; - GrBatchFlushState fFlushState; + GrOpFlushState fFlushState; bool fFlushing; bool fIsImmediateMode; |