3 files changed, 24 insertions, 8 deletions
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index d1367e9c9c..48f2ea67d3 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "GrGpuCommandBuffer.h"
 #include "GrMeshDrawOp.h"
 #include "GrOpFlushState.h"
 #include "GrResourceProvider.h"
diff --git a/src/gpu/ops/GrStencilPathOp.cpp b/src/gpu/ops/GrStencilPathOp.cpp
new file mode 100644
index 0000000000..01042f6670
--- /dev/null
+++ b/src/gpu/ops/GrStencilPathOp.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrStencilPathOp.h"
+
+#include "GrGpu.h"
+#include "GrOpFlushState.h"
+
+void GrStencilPathOp::onExecute(GrOpFlushState* state) {
+    SkASSERT(state->drawOpArgs().fRenderTarget);
+
+    GrPathRendering::StencilPathArgs args(fUseHWAA, state->drawOpArgs().fRenderTarget,
+                                          &fViewMatrix, &fScissor, &fStencil);
+    state->gpu()->pathRendering()->stencilPath(args, fPath.get());
+}
+
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index 5b308f08e0..45240be4fd 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -9,11 +9,12 @@
 #define GrStencilPathOp_DEFINED
 
 #include "GrOp.h"
-#include "GrOpFlushState.h"
 #include "GrPath.h"
 #include "GrPathRendering.h"
 #include "GrStencilSettings.h"
 
+class GrOpFlushState;
+
 class GrStencilPathOp final : public GrOp {
 public:
     DEFINE_OP_CLASS_ID
@@ -62,13 +63,7 @@ private:
 
     void onPrepare(GrOpFlushState*) override {}
 
-    void onExecute(GrOpFlushState* state) override {
-        SkASSERT(state->drawOpArgs().fRenderTarget);
-
-        GrPathRendering::StencilPathArgs args(fUseHWAA, state->drawOpArgs().fRenderTarget,
-                                              &fViewMatrix, &fScissor, &fStencil);
-        state->gpu()->pathRendering()->stencilPath(args, fPath.get());
-    }
+    void onExecute(GrOpFlushState* state) override;
 
     SkMatrix                                          fViewMatrix;
     bool                                              fUseHWAA;