From c4e87724920222a218f31b22612efc5b1ec0ed6c Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Fri, 6 Feb 2015 08:20:07 -0800
Subject: Revert of rename SkCanvasDrawable to SkDrawable, and make public
 (patchset #2 id:20001 of https://codereview.chromium.org/903993002/)

Reason for revert:
bug in gyp

Original issue's description:
> rename SkCanvasDrawable to SkDrawable, and make public
>
> BUG=skia:
> NOTRY=True
> ... winbuilder flake
>
> Committed: https://skia.googlesource.com/skia/+/4ae9eb7463cf2160723407359608f221c0d5e2a6

TBR=robertphillips@google.com,djsollen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/882853006
---
 samplecode/SampleArc.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'samplecode/SampleArc.cpp')

diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index bc20e92cc3..3775de50c8 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -9,7 +9,6 @@
 #include "SkAnimTimer.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDrawable.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRegion.h"
@@ -25,6 +24,8 @@
 #include "SkColorFilter.h"
 #include "SkLayerRasterizer.h"
 
+#include "SkCanvasDrawable.h"
+
 #include "SkParsePath.h"
 static void testparse() {
     SkRect r;
@@ -39,7 +40,7 @@ static void testparse() {
 }
 
 class ArcsView : public SampleView {
-    class MyDrawable : public SkDrawable {
+    class MyDrawable : public SkCanvasDrawable {
         SkRect   fR;
         SkScalar fSweep;
     public:
@@ -83,7 +84,7 @@ class ArcsView : public SampleView {
 public:
     SkRect fRect;
     MyDrawable* fAnimatingDrawable;
-    SkDrawable* fRootDrawable;
+    SkCanvasDrawable* fRootDrawable;
 
     ArcsView() {
         testparse();
@@ -96,7 +97,7 @@ public:
 
         SkPictureRecorder recorder;
         this->drawRoot(recorder.beginRecording(SkRect::MakeWH(800, 500)));
-        fRootDrawable = recorder.endRecordingAsDrawable();
+        fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable();
     }
 
     ~ArcsView() SK_OVERRIDE {
@@ -189,13 +190,13 @@ protected:
 
         DrawRectWithLines(canvas, fRect, paint);
 
-        canvas->drawDrawable(fAnimatingDrawable);
+        canvas->EXPERIMENTAL_drawDrawable(fAnimatingDrawable);
 
         DrawArcs(canvas);
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->drawDrawable(fRootDrawable);
+        canvas->EXPERIMENTAL_drawDrawable(fRootDrawable);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {
-- 
cgit v1.2.3