Revert of r13620 (add new onClip* methods to SkCanvas - https://codereview.chromium.org/183453002/) due to broken Chrome Canary and failing tests.

git-svn-id: http://skia.googlecode.com/svn/trunk@13622 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 45 insertions, 56 deletions

diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h
index 506d49f35f..8ec2d32d0f 100644
--- a/experimental/PdfViewer/SkNulCanvas.h
+++ b/experimental/PdfViewer/SkNulCanvas.h
@@ -26,89 +26,78 @@ public:
     explicit SkNulCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap) {}
     virtual ~SkNulCanvas() {}
 
-    virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) SK_OVERRIDE {return 0;}
+    virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) {return 0;}
     virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
-                          SaveFlags flags = kARGB_ClipLayer_SaveFlag) SK_OVERRIDE {return 0;}
+                          SaveFlags flags = kARGB_ClipLayer_SaveFlag) {return 0;}
     int saveLayerAlpha(const SkRect* bounds, U8CPU alpha,
                        SaveFlags flags = kARGB_ClipLayer_SaveFlag) {return 0;}
-    virtual void restore() SK_OVERRIDE {}
+    virtual void restore() {}
     int getSaveCount() const {return 0;}
-    virtual bool isDrawingToLayer() const SK_OVERRIDE {return false;}
-    virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE {return true;}
-    virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE {return true;}
-    virtual bool rotate(SkScalar degrees) SK_OVERRIDE {return true;}
-    virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE {return true;}
-    virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE {return true;}
-    virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE {}
-    virtual void clear(SkColor) SK_OVERRIDE {}
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE {}
+    virtual bool isDrawingToLayer() const {return false;}
+    virtual bool translate(SkScalar dx, SkScalar dy) {return true;}
+    virtual bool scale(SkScalar sx, SkScalar sy) {return true;}
+    virtual bool rotate(SkScalar degrees) {return true;}
+    virtual bool skew(SkScalar sx, SkScalar sy) {return true;}
+    virtual bool concat(const SkMatrix& matrix) {return true;}
+    virtual void setMatrix(const SkMatrix& matrix) {}
+    virtual bool clipRect(const SkRect& rect,
+                          SkRegion::Op op = SkRegion::kIntersect_Op,
+                          bool doAntiAlias = false) {return true;}
+    virtual bool clipRRect(const SkRRect& rrect,
+                           SkRegion::Op op = SkRegion::kIntersect_Op,
+                           bool doAntiAlias = false) {return true;}
+    virtual bool clipPath(const SkPath& path,
+                          SkRegion::Op op = SkRegion::kIntersect_Op,
+                          bool doAntiAlias = false) {return true;}
+    virtual bool clipRegion(const SkRegion& deviceRgn,
+                            SkRegion::Op op = SkRegion::kIntersect_Op) {return true;}
+    virtual void clear(SkColor) {}
+    virtual void drawPaint(const SkPaint& paint) {}
     virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE {}
-    virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE {}
-    virtual void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE {}
-    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE {}
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE {}
+                            const SkPaint& paint) {}
+    virtual void drawRect(const SkRect& rect, const SkPaint& paint) {}
+    virtual void drawOval(const SkRect& oval, const SkPaint&) {}
+    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) {}
+    virtual void drawPath(const SkPath& path, const SkPaint& paint) {}
     virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint = NULL) SK_OVERRIDE {}
+                            const SkPaint* paint = NULL) {}
     virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
                                       const SkRect& dst,
                                       const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE {}
+                                      DrawBitmapRectFlags flags) {}
     virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint = NULL) SK_OVERRIDE {}
+                                  const SkPaint* paint = NULL) {}
     virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE {}
+                                const SkRect& dst, const SkPaint* paint = NULL) {}
     virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint = NULL) SK_OVERRIDE {}
+                            const SkPaint* paint = NULL) {}
     virtual void drawText(const void* text, size_t byteLength, SkScalar x,
-                          SkScalar y, const SkPaint& paint) SK_OVERRIDE {}
+                          SkScalar y, const SkPaint& paint) {}
     virtual void drawPosText(const void* text, size_t byteLength,
-                             const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE {}
+                             const SkPoint pos[], const SkPaint& paint) {}
     virtual void drawPosTextH(const void* text, size_t byteLength,
                               const SkScalar xpos[], SkScalar constY,
-                              const SkPaint& paint) SK_OVERRIDE {}
+                              const SkPaint& paint) {}
     virtual void drawTextOnPath(const void* text, size_t byteLength,
                                 const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE {}
-    virtual void drawPicture(SkPicture& picture) SK_OVERRIDE {}
+                                const SkPaint& paint) {}
+    virtual void drawPicture(SkPicture& picture) {}
     virtual void drawVertices(VertexMode vmode, int vertexCount,
                               const SkPoint vertices[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE {}
-    virtual void drawData(const void* data, size_t length) SK_OVERRIDE {}
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE {}
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE {}
-    virtual void endCommentGroup() SK_OVERRIDE {}
-    virtual SkBounder* setBounder(SkBounder* bounder) SK_OVERRIDE {return NULL;}
-    virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;}
-
-    virtual bool isClipEmpty() const SK_OVERRIDE { return false; }
-    virtual ClipType getClipType() const SK_OVERRIDE { return kRect_ClipType; }
-    virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE {
-        if (NULL != bounds) {
-            bounds->setXYWH(0, 0, 
-                            SkIntToScalar(this->imageInfo().fWidth), 
-                            SkIntToScalar(this->imageInfo().fHeight));
-        }
-        return true;
-    }
-    virtual bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE {
-        if (NULL != bounds) {
-            bounds->setLargest();
-        }
-        return true;
-    }
+                              const SkPaint& paint) {}
+    virtual void drawData(const void* data, size_t length) {}
+    virtual void beginCommentGroup(const char* description) {}
+    virtual void addComment(const char* kywd, const char* value) {}
+    virtual void endCommentGroup() {}
+    virtual SkBounder* setBounder(SkBounder* bounder) {return NULL;}
+    virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) {return NULL;}
 
 protected:
     virtual SkCanvas* canvasForDrawIter() {return NULL;}
     virtual SkBaseDevice* setDevice(SkBaseDevice* device) {return NULL;}
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op)  SK_OVERRIDE {}
-
 private:
     typedef SkCanvas INHERITED;
 };