cc: Clean up naming of paint-related identifiers

cc/layers/picture_layer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/picture_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
@@ skipping 123 matching lines @@
     last_updated_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
-sk_sp<PaintRecord> PictureLayer::GetPicture() const {
-  // We could either flatten the RecordingSource into a single
-  // PaintRecord, or paint a fresh one depending on what we intend to do with
-  // the record. For now we just paint a fresh one to get consistent results.
+sk_sp<SkPicture> PictureLayer::GetPicture() const {
+  // We could either flatten the RecordingSource into a single SkPicture, or
+  // paint a fresh one depending on what we intend to do with it.  For now we
+  // just paint a fresh one to get consistent results.
   if (!DrawsContent())
     return nullptr;
 
   gfx::Size layer_size = bounds();
   RecordingSource recording_source;
   Region recording_invalidation;
 
   gfx::Rect new_recorded_viewport =
       picture_layer_inputs_.client->PaintableRegion();
   scoped_refptr<DisplayItemList> display_list =
@@ skipping 68 matching lines @@
     picture_layer_inputs_.display_list = nullptr;
     picture_layer_inputs_.painter_reported_memory_usage = 0;
   }
 }
 
 const DisplayItemList* PictureLayer::GetDisplayItemList() {
   return picture_layer_inputs_.display_list.get();
 }
 
 }  // namespace cc