diff options
| author | fmalita <fmalita@chromium.org> | 2015-08-03 21:58:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 05:00:39 +0000 |
| commit | 386ff1c46b148fc76190a51edea83f162238020a (patch) | |
| tree | ac5c3189da65ce42f78f5bbb130564db2de9d52a /cc/blink/web_image_layer_impl.cc | |
| parent | 301af9347c32ac621ab06b08eb089f8ee643795f (diff) | |
| download | chromium_src-386ff1c46b148fc76190a51edea83f162238020a.zip chromium_src-386ff1c46b148fc76190a51edea83f162238020a.tar.gz chromium_src-386ff1c46b148fc76190a51edea83f162238020a.tar.bz2 | |
SkImage-backed PictureImageLayer
Now that Blink only ever calls SetImage, remove the SetBitmap impls and
replace the internal SkBitmap with an SkImage ref.
Also update the related unittests to use SkSurface/SkImage.
BUG=515935
R=reed@google.com,danakj@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1260913003
Cr-Commit-Position: refs/heads/master@{#341676}
Diffstat (limited to 'cc/blink/web_image_layer_impl.cc')
| -rw-r--r-- | cc/blink/web_image_layer_impl.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cc/blink/web_image_layer_impl.cc b/cc/blink/web_image_layer_impl.cc index eb9ff5e..efa4242 100644 --- a/cc/blink/web_image_layer_impl.cc +++ b/cc/blink/web_image_layer_impl.cc @@ -7,7 +7,6 @@ #include "cc/blink/web_layer_impl.h" #include "cc/blink/web_layer_impl_fixed_bounds.h" #include "cc/layers/picture_image_layer.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkImage.h" namespace cc_blink { @@ -24,14 +23,10 @@ blink::WebLayer* WebImageLayerImpl::layer() { return layer_.get(); } -void WebImageLayerImpl::setImageBitmap(const SkBitmap& bitmap) { - static_cast<cc::PictureImageLayer*>(layer_->layer())->SetBitmap(bitmap); - static_cast<WebLayerImplFixedBounds*>(layer_.get()) - ->SetFixedBounds(gfx::Size(bitmap.width(), bitmap.height())); -} - void WebImageLayerImpl::setImage(const SkImage* image) { - static_cast<cc::PictureImageLayer*>(layer_->layer())->SetImage(image); + skia::RefPtr<const SkImage> imageRef = skia::SharePtr(image); + static_cast<cc::PictureImageLayer*>(layer_->layer()) + ->SetImage(imageRef.Pass()); static_cast<WebLayerImplFixedBounds*>(layer_.get()) ->SetFixedBounds(gfx::Size(image->width(), image->height())); } |