OLD | NEW |
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/layers/picture_image_layer.h" | 5 #include "cc/layers/picture_image_layer.h" |
6 | 6 |
7 #include "cc/layers/picture_image_layer_impl.h" | 7 #include "cc/layers/picture_image_layer_impl.h" |
8 #include "cc/resources/drawing_display_item.h" | 8 #include "cc/resources/drawing_display_item.h" |
9 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
10 #include "third_party/skia/include/core/SkPictureRecorder.h" | 10 #include "third_party/skia/include/core/SkPictureRecorder.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 SkScalar content_to_layer_scale_y = | 56 SkScalar content_to_layer_scale_y = |
57 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height()); | 57 SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height()); |
58 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); | 58 canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y); |
59 | 59 |
60 // Because Android WebView resourceless software draw mode rasters directly | 60 // Because Android WebView resourceless software draw mode rasters directly |
61 // to the root canvas, this draw must use the kSrcOver_Mode so that | 61 // to the root canvas, this draw must use the kSrcOver_Mode so that |
62 // transparent images blend correctly. | 62 // transparent images blend correctly. |
63 canvas->drawBitmap(bitmap_, 0, 0); | 63 canvas->drawBitmap(bitmap_, 0, 0); |
64 } | 64 } |
65 | 65 |
66 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList( | 66 void PictureImageLayer::PaintContentsToDisplayList( |
| 67 DisplayItemList* display_list, |
67 const gfx::Rect& clip, | 68 const gfx::Rect& clip, |
68 ContentLayerClient::PaintingControlSetting painting_control) { | 69 ContentLayerClient::PaintingControlSetting painting_control) { |
69 scoped_refptr<DisplayItemList> display_item_list = DisplayItemList::Create(); | |
70 | |
71 SkPictureRecorder recorder; | 70 SkPictureRecorder recorder; |
72 SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip)); | 71 SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip)); |
73 PaintContents(canvas, clip, painting_control); | 72 PaintContents(canvas, clip, painting_control); |
74 | 73 |
75 skia::RefPtr<SkPicture> picture = | 74 skia::RefPtr<SkPicture> picture = |
76 skia::AdoptRef(recorder.endRecordingAsPicture()); | 75 skia::AdoptRef(recorder.endRecordingAsPicture()); |
77 display_item_list->AppendItem(DrawingDisplayItem::Create(picture)); | 76 display_list->AppendItem(DrawingDisplayItem::Create(picture)); |
78 return display_item_list; | |
79 } | 77 } |
80 | 78 |
81 bool PictureImageLayer::FillsBoundsCompletely() const { | 79 bool PictureImageLayer::FillsBoundsCompletely() const { |
82 return false; | 80 return false; |
83 } | 81 } |
84 | 82 |
85 } // namespace cc | 83 } // namespace cc |
OLD | NEW |