API migration: picture.draw -> picture.playback

patch from issue 802973002 at patchset 1 (http://crrev.com/802973002#ps1)

BUG=
TBR=benm@chromium.org
add tbr for android_webview owner

Review URL: https://codereview.chromium.org/795823003

Cr-Commit-Position: refs/heads/master@{#308383}

android_webview/native/aw_picture.cc

@@ -39,7 +39,7 @@ void AwPicture::Draw(JNIEnv* env, jobject obj, jobject canvas) {
     LOG(ERROR) << "Couldn't draw picture";
     return;
   }
-  picture_->draw(canvas_holder->GetCanvas());
+  picture_->playback(canvas_holder->GetCanvas());
 }
 
 bool RegisterAwPicture(JNIEnv* env) {

cc/resources/drawing_display_item.cc

@@ -24,7 +24,7 @@ void DrawingDisplayItem::Raster(SkCanvas* canvas,
   canvas->save();
   canvas->translate(location_.x(), location_.y());
   if (callback)
-    picture_->draw(canvas, callback);
+    picture_->playback(canvas, callback);
   else
     canvas->drawPicture(picture_.get());
   canvas->restore();

cc/resources/picture.cc

@@ -340,7 +340,7 @@ int Picture::Raster(SkCanvas* canvas,
   if (callback) {
     // If we have a callback, we need to call |draw()|, |drawPicture()| doesn't
     // take a callback.  This is used by |AnalysisCanvas| to early out.
-    picture_->draw(canvas, callback);
+    picture_->playback(canvas, callback);
   } else {
     // Prefer to call |drawPicture()| on the canvas since it could place the
     // entire picture on the canvas instead of parsing the skia operations.
@@ -358,7 +358,7 @@ int Picture::Raster(SkCanvas* canvas,
 void Picture::Replay(SkCanvas* canvas) {
   TRACE_EVENT_BEGIN0("cc", "Picture::Replay");
   DCHECK(picture_);
-  picture_->draw(canvas);
+  picture_->playback(canvas);
   SkIRect bounds;
   canvas->getClipDeviceBounds(&bounds);
   TRACE_EVENT_END1("cc", "Picture::Replay",

skia/config/SkUserConfig.h

@@ -265,10 +265,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #   define SK_IGNORE_GPU_DITHER
 #endif
 
-#ifndef    SK_LEGACY_PICTURE_DRAW_API
-#   define SK_LEGACY_PICTURE_DRAW_API
-#endif
-
 // If this goes well, we can have Skia respect DYNAMIC_ANNOTATIONS_ENABLED directly.
 #if DYNAMIC_ANNOTATIONS_ENABLED
 #    define SK_DYNAMIC_ANNOTATIONS_ENABLED 1

skia/ext/analysis_canvas_unittest.cc

@@ -310,7 +310,7 @@ TEST(AnalysisCanvasTest, EarlyOutNotSolid) {
   // Draw the picture into the analysis canvas, using the canvas as a callback
   // as well.
   skia::AnalysisCanvas canvas(256, 256);
-  picture->draw(&canvas, &canvas);
+  picture->playback(&canvas, &canvas);
 
   // Ensure that canvas is not solid.
   SkColor output_color;