Skip to content

Commit

Permalink
Handle simple SkImageShaders
Browse files Browse the repository at this point in the history 
Currently, the Image Decode Controller (IDC) can't process images that
are embedded in a SkPaint's SkShader. This change expands coverage to
handle cases where the SkShader is a simple SkImageShader, for which
Skia provides introspection via isAImage().

This change updates DiscardableImageMap to allow us to track and pre-
decode these images. It additionally updates ImageHijackCanvas to
replace the un-decoded images with decoded ones at runtime.

This change does not yet handle decoding sub-rects of images used
in an SkImageShader, although that should be a relatively
straight-forward follow-up.

R=vmpstr,vmiura
BUG=667479
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2514263002
Cr-Commit-Position: refs/heads/master@{#436796}
  • Loading branch information
ericrk authored and Commit bot committed Dec 7, 2016
1 parent 4379a8b commit 6dfd1ba
Show file tree
Hide file tree
Showing 27 changed files with 275 additions and 25 deletions.
47 changes: 46 additions & 1 deletion cc/playback/discardable_image_map.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "base/memory/ptr_util.h"
#include "cc/base/math_util.h"
#include "cc/playback/display_item_list.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/utils/SkNWayCanvas.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/skia_util.h"
Expand Down Expand Up @@ -100,7 +101,7 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
}
SkMatrix matrix;
matrix.setRectToRect(*src, dst, SkMatrix::kFill_ScaleToFit);
matrix.postConcat(ctm);
matrix.preConcat(ctm);
AddImage(sk_ref_sp(image), *src, MapRect(ctm, dst), matrix, paint);
}

Expand All @@ -112,6 +113,30 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
NOTREACHED();
}

void onDrawRect(const SkRect& r, const SkPaint& paint) override {
AddPaintImage(r, paint);
}

void onDrawPath(const SkPath& path, const SkPaint& paint) override {
AddPaintImage(path.getBounds(), paint);
}

void onDrawOval(const SkRect& r, const SkPaint& paint) override {
AddPaintImage(r, paint);
}

void onDrawArc(const SkRect& r,
SkScalar start_angle,
SkScalar sweep_angle,
bool use_center,
const SkPaint& paint) override {
AddPaintImage(r, paint);
}

void onDrawRRect(const SkRRect& rr, const SkPaint& paint) override {
AddPaintImage(rr.rect(), paint);
}

SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override {
saved_paints_.push_back(*rec.fPaint);
return SkNWayCanvas::getSaveLayerStrategy(rec);
Expand Down Expand Up @@ -178,6 +203,26 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
SafeClampPaintRectToSize(paint_rect, canvas_size_)));
}

// Currently this function only handles extracting images from SkImageShaders
// embedded in SkPaints. Other embedded image cases, such as SkPictures,
// are not yet handled.
void AddPaintImage(const SkRect& rect, const SkPaint& paint) {
SkShader* shader = paint.getShader();
if (shader) {
SkMatrix matrix;
SkShader::TileMode xy[2];
SkImage* image = shader->isAImage(&matrix, xy);
if (image) {
const SkMatrix& ctm = getTotalMatrix();
matrix.postConcat(ctm);
// TODO(ericrk): Handle cases where we only need a sub-rect from the
// image.
AddImage(sk_ref_sp(image), SkRect::MakeFromIRect(image->bounds()),
MapRect(ctm, rect), matrix, &paint);
}
}
}

std::vector<std::pair<DrawImage, gfx::Rect>>* image_set_;
const SkRect canvas_bounds_;
const gfx::Size canvas_size_;
Expand Down
121 changes: 100 additions & 21 deletions cc/playback/discardable_image_map_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@
namespace cc {
namespace {

struct PositionDrawImage {
PositionDrawImage(sk_sp<const SkImage> image, const gfx::Rect& image_rect)
: image(std::move(image)), image_rect(image_rect) {}
struct PositionScaleDrawImage {
PositionScaleDrawImage(sk_sp<const SkImage> image,
const gfx::Rect& image_rect,
const SkSize& scale)
: image(std::move(image)), image_rect(image_rect), scale(scale) {}
sk_sp<const SkImage> image;
gfx::Rect image_rect;
SkSize scale;
};

} // namespace

class DiscardableImageMapTest : public testing::Test {
public:
std::vector<PositionDrawImage> GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> GetDiscardableImagesInRect(
const DiscardableImageMap& image_map,
const gfx::Rect& rect) {
std::vector<DrawImage> draw_images;
Expand All @@ -45,11 +48,12 @@ class DiscardableImageMapTest : public testing::Test {

std::vector<size_t> indices;
image_map.images_rtree_.Search(rect, &indices);
std::vector<PositionDrawImage> position_draw_images;
std::vector<PositionScaleDrawImage> position_draw_images;
for (size_t index : indices) {
position_draw_images.push_back(
PositionDrawImage(image_map.all_images_[index].first.image(),
image_map.all_images_[index].second));
PositionScaleDrawImage(image_map.all_images_[index].first.image(),
image_map.all_images_[index].second,
image_map.all_images_[index].first.scale()));
}

EXPECT_EQ(draw_images.size(), position_draw_images.size());
Expand Down Expand Up @@ -100,7 +104,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {

for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
std::vector<PositionDrawImage> images = GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(x * 512, y * 512, 500, 500));
if ((x + y) & 1) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
Expand All @@ -115,7 +119,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
}

// Capture 4 pixel refs.
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(512, 512, 2048, 2048));
EXPECT_EQ(4u, images.size());
EXPECT_TRUE(images[0].image == discardable_image[1][2]);
Expand Down Expand Up @@ -173,7 +177,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {

for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
std::vector<PositionDrawImage> images = GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(1024 + x * 512, y * 512, 500, 500));
if ((x + y) & 1) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
Expand All @@ -188,7 +192,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
}
// Capture 4 pixel refs.
{
std::vector<PositionDrawImage> images = GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(1024 + 512, 512, 2048, 2048));
EXPECT_EQ(4u, images.size());
EXPECT_TRUE(images[0].image == discardable_image[1][2]);
Expand All @@ -207,22 +211,22 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {

// Non intersecting rects
{
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1000, 1000));
EXPECT_EQ(0u, images.size());
}
{
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(3500, 0, 1000, 1000));
EXPECT_EQ(0u, images.size());
}
{
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 1100, 1000, 1000));
EXPECT_EQ(0u, images.size());
}
{
std::vector<PositionDrawImage> images = GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(3500, 1100, 1000, 1000));
EXPECT_EQ(0u, images.size());
}
Expand Down Expand Up @@ -269,7 +273,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {

for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
std::vector<PositionDrawImage> images = GetDiscardableImagesInRect(
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(x * 512 + 256, y * 512 + 256, 1, 1));
if ((x + y) & 1) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
Expand Down Expand Up @@ -305,7 +309,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) {
visible_rect.size());
display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
}
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image == discardable_image);
Expand All @@ -332,7 +336,7 @@ TEST_F(DiscardableImageMapTest, PaintDestroyedWhileImageIsDrawn) {
generator.canvas()->restore();
}

std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image == discardable_image);
Expand Down Expand Up @@ -360,7 +364,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImage) {
visible_rect.size());
display_list->Raster(generator.canvas(), nullptr, visible_rect, 1.f);
}
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(42, 42, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image == discardable_image);
Expand Down Expand Up @@ -399,7 +403,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImageMaxLayer) {
visible_rect.size());
display_list->Raster(generator.canvas(), nullptr, visible_rect, 1.f);
}
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_EQ(gfx::Rect(0, 0, dimension, dimension), images[0].image_rect);
Expand Down Expand Up @@ -450,7 +454,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesRectInBounds) {
visible_rect.size());
display_list->Raster(generator.canvas(), nullptr, visible_rect, 1.f);
}
std::vector<PositionDrawImage> images =
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_EQ(gfx::Rect(0, 0, 90, 89), images[0].image_rect);
Expand All @@ -464,4 +468,79 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesRectInBounds) {
EXPECT_EQ(gfx::Rect(0, 500, 1000, 100), images[0].image_rect);
}

TEST_F(DiscardableImageMapTest, GetDiscardableImagesInShader) {
gfx::Rect visible_rect(2048, 2048);
FakeContentLayerClient content_layer_client;
content_layer_client.set_bounds(visible_rect.size());

// Discardable pixel refs are found in the following grids:
// |---|---|---|---|
// | | x | | x |
// |---|---|---|---|
// | x | | x | |
// |---|---|---|---|
// | | x | | x |
// |---|---|---|---|
// | x | | x | |
// |---|---|---|---|
sk_sp<SkImage> discardable_image[4][4];
for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
if ((x + y) & 1) {
discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
SkMatrix scale = SkMatrix::MakeScale(x * 0.5f, y * 0.5f);
SkPaint paint;
paint.setShader(discardable_image[y][x]->makeShader(
SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &scale));
content_layer_client.add_draw_rect(
gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500), paint);
}
}
}

scoped_refptr<DisplayItemList> display_list =
content_layer_client.PaintContentsToDisplayList(
ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);

DiscardableImageMap image_map;
{
DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
visible_rect.size());
display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
}

for (int y = 0; y < 4; ++y) {
for (int x = 0; x < 4; ++x) {
std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(
image_map, gfx::Rect(x * 512, y * 512, 500, 500));
if ((x + y) & 1) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
EXPECT_TRUE(images[0].image == discardable_image[y][x]) << x << " "
<< y;
EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
images[0].image_rect);
EXPECT_EQ(x * 0.5f, images[0].scale.fWidth);
EXPECT_EQ(y * 0.5f, images[0].scale.fHeight);
} else {
EXPECT_EQ(0u, images.size()) << x << " " << y;
}
}
}

// Capture 4 pixel refs.
std::vector<PositionScaleDrawImage> images =
GetDiscardableImagesInRect(image_map, gfx::Rect(512, 512, 2048, 2048));
EXPECT_EQ(4u, images.size());
EXPECT_TRUE(images[0].image == discardable_image[1][2]);
EXPECT_EQ(gfx::Rect(2 * 512 + 6, 512 + 6, 500, 500), images[0].image_rect);
EXPECT_TRUE(images[1].image == discardable_image[2][1]);
EXPECT_EQ(gfx::Rect(512 + 6, 2 * 512 + 6, 500, 500), images[1].image_rect);
EXPECT_TRUE(images[2].image == discardable_image[2][3]);
EXPECT_EQ(gfx::Rect(3 * 512 + 6, 2 * 512 + 6, 500, 500),
images[2].image_rect);
EXPECT_TRUE(images[3].image == discardable_image[3][2]);
EXPECT_EQ(gfx::Rect(2 * 512 + 6, 3 * 512 + 6, 500, 500),
images[3].image_rect);
}

} // namespace cc
Loading

0 comments on commit 6dfd1ba

Please sign in to comment.