Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: cc/layers/picture_image_layer.cc

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/picture_image_layer.h ('k') | cc/layers/picture_image_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_image_layer.cc
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc
index b972ec193592a864025aa1919608dce28541196f..2d338f00cb4d9a095330ae7febb4d4d1accbce86 100644
--- a/cc/layers/picture_image_layer.cc
+++ b/cc/layers/picture_image_layer.cc
@@ -63,19 +63,17 @@ void PictureImageLayer::PaintContents(
canvas->drawBitmap(bitmap_, 0, 0);
}
-scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList(
+void PictureImageLayer::PaintContentsToDisplayList(
+ DisplayItemList* display_list,
const gfx::Rect& clip,
ContentLayerClient::PaintingControlSetting painting_control) {
- scoped_refptr<DisplayItemList> display_item_list = DisplayItemList::Create();
-
SkPictureRecorder recorder;
SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip));
PaintContents(canvas, clip, painting_control);
skia::RefPtr<SkPicture> picture =
skia::AdoptRef(recorder.endRecordingAsPicture());
- display_item_list->AppendItem(DrawingDisplayItem::Create(picture));
- return display_item_list;
+ display_list->AppendItem(DrawingDisplayItem::Create(picture));
}
bool PictureImageLayer::FillsBoundsCompletely() const {
« no previous file with comments | « cc/layers/picture_image_layer.h ('k') | cc/layers/picture_image_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698