diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/cc/layers/picture_image_layer.cc | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/cc/layers/picture_image_layer.cc')
| -rw-r--r-- | chromium/cc/layers/picture_image_layer.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/chromium/cc/layers/picture_image_layer.cc b/chromium/cc/layers/picture_image_layer.cc index 81d01f73451..0e909d6b8a6 100644 --- a/chromium/cc/layers/picture_image_layer.cc +++ b/chromium/cc/layers/picture_image_layer.cc @@ -7,14 +7,11 @@ #include <stddef.h> #include "cc/layers/picture_layer_impl.h" -#include "cc/playback/display_item_list_settings.h" +#include "cc/paint/paint_canvas.h" +#include "cc/paint/paint_recorder.h" #include "cc/playback/drawing_display_item.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_settings.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" -#include "ui/gfx/skia_util.h" namespace cc { @@ -30,7 +27,7 @@ PictureImageLayer::~PictureImageLayer() { std::unique_ptr<LayerImpl> PictureImageLayer::CreateLayerImpl( LayerTreeImpl* tree_impl) { - auto layer_impl = PictureLayerImpl::Create(tree_impl, id(), is_mask()); + auto layer_impl = PictureLayerImpl::Create(tree_impl, id(), mask_type()); layer_impl->set_is_directly_composited_image(true); return std::move(layer_impl); } @@ -63,14 +60,10 @@ scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList( DCHECK_GT(image_->height(), 0); DCHECK(layer_tree_host()); - DisplayItemListSettings settings; - settings.use_cached_picture = - layer_tree_host()->GetSettings().use_cached_picture_raster; - scoped_refptr<DisplayItemList> display_list = - DisplayItemList::Create(settings); + auto display_list = make_scoped_refptr(new DisplayItemList); - SkPictureRecorder recorder; - SkCanvas* canvas = + PaintRecorder recorder; + PaintCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(PaintableRegion())); SkScalar content_to_layer_scale_x = |