commit ebfce6d9b42198e04288a15953f40c395a7b6139
author Mike Reed <reed@google.com> Mon Dec 12 10:02:12 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 12 15:38:31 2016 +0000
tree edb5bfa26c2efb5c58f7071efb3811ca33e23560
parent c30833327f0dda75a8fbe061f3f1966d1f6621a3

change SkClipOp to a class enum

BUG=skia:

Change-Id: I25dbe6d6b8666a2a0a7be7bdd2ae0b067868d14e
Reviewed-on: https://skia-review.googlesource.com/5718
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 1acd975..8797c4d 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -36,6 +36,7 @@
 #include "SkWindow.h"
 #include "sk_tool_utils.h"
 #include "SkScan.h"
+#include "SkClipOpPriv.h"
 
 #include "SkReadBuffer.h"
 #include "SkStream.h"

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 82466ba..75367cc 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -13,6 +13,7 @@
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRandom.h"
+#include "SkClipOpPriv.h"
 
 constexpr int W = 150;
 constexpr int H = 200;

samplecode/SampleComplexClip.cpp

diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index ae8a20f..b9c9307 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -4,10 +4,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SampleCode.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkView.h"
+#include "SkClipOpPriv.h"
 
 class ComplexClipView : public SampleView {
 public:

samplecode/SampleFatBits.cpp

diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 65c929c..c49cdad 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -15,6 +15,7 @@
 #include "SkUtils.h"
 #include "SkImage.h"
 #include "SkSurface.h"
+#include "SkClipOpPriv.h"
 
 #define FAT_PIXEL_COLOR     SK_ColorBLACK
 #define PIXEL_CENTER_SIZE   3

samplecode/SampleIdentityScale.cpp

diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp
index ae6092a..95970e7 100644
--- a/samplecode/SampleIdentityScale.cpp
+++ b/samplecode/SampleIdentityScale.cpp
@@ -17,6 +17,7 @@
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkTime.h"
+#include "SkClipOpPriv.h"
 
 // Intended to exercise pixel snapping observed with scaled images (and
 // with non-scaled images, but for a different reason):  Bug 1145

samplecode/SampleLayers.cpp

diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index faf4fde..ab75ddb 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -24,6 +24,7 @@
 #include "SkUtils.h"
 #include "SkKey.h"
 #include "SkDrawFilter.h"
+#include "SkClipOpPriv.h"
 
 static void make_paint(SkPaint* paint, const SkMatrix& localMatrix) {
     SkColor colors[] = { 0, SK_ColorWHITE };