summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/layers/picture_layer_impl.cc26
-rw-r--r--cc/layers/picture_layer_impl_unittest.cc14
-rw-r--r--cc/resources/picture_layer_tiling.cc6
-rw-r--r--cc/resources/picture_layer_tiling.h9
-rw-r--r--cc/resources/picture_layer_tiling_set.cc7
-rw-r--r--cc/resources/picture_layer_tiling_set.h4
-rw-r--r--cc/resources/picture_layer_tiling_set_unittest.cc6
-rw-r--r--cc/resources/picture_layer_tiling_unittest.cc9
8 files changed, 19 insertions, 62 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index bd4aa0f..bb476a2 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -96,20 +96,11 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
draw_transform(),
gfx::QuadF(rect),
&clipped);
- bool is_axis_aligned_in_target = !clipped && target_quad.IsRectilinear();
-
- bool is_pixel_aligned = is_axis_aligned_in_target &&
- draw_transform().IsIdentityOrIntegerTranslation();
- PictureLayerTiling::LayerDeviceAlignment layerDeviceAlignment =
- is_pixel_aligned ? PictureLayerTiling::LayerAlignedToDevice
- : PictureLayerTiling::LayerNotAlignedToDevice;
-
if (ShowDebugBorders()) {
for (PictureLayerTilingSet::Iterator iter(tilings_.get(),
contents_scale_x(),
rect,
- ideal_contents_scale_,
- layerDeviceAlignment);
+ ideal_contents_scale_);
iter;
++iter) {
SkColor color;
@@ -153,8 +144,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
for (PictureLayerTilingSet::Iterator iter(tilings_.get(),
contents_scale_x(),
rect,
- ideal_contents_scale_,
- layerDeviceAlignment);
+ ideal_contents_scale_);
iter;
++iter) {
@@ -475,11 +465,7 @@ ResourceProvider::ResourceId PictureLayerImpl::ContentsResourceId() const {
gfx::Rect content_rect(content_bounds());
float scale = contents_scale_x();
for (PictureLayerTilingSet::Iterator
- iter(tilings_.get(),
- scale,
- content_rect,
- ideal_contents_scale_,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ iter(tilings_.get(), scale, content_rect, ideal_contents_scale_);
iter;
++iter) {
// Mask resource not ready yet.
@@ -535,11 +521,7 @@ bool PictureLayerImpl::AreVisibleResourcesReady() const {
if (tiling->contents_scale() < min_acceptable_scale)
continue;
- for (PictureLayerTiling::Iterator
- iter(tiling,
- contents_scale_x(),
- rect,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ for (PictureLayerTiling::Iterator iter(tiling, contents_scale_x(), rect);
iter;
++iter) {
if (should_force_uploads && iter)
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 48a5f51..f21ad3e 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -194,10 +194,7 @@ class PictureLayerImplTest : public testing::Test {
const PictureLayerTiling* tiling,
PicturePileImpl* pile) {
for (PictureLayerTiling::Iterator
- iter(tiling,
- tiling->contents_scale(),
- tiling->ContentRect(),
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ iter(tiling, tiling->contents_scale(), tiling->ContentRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -343,8 +340,7 @@ TEST_F(PictureLayerImplTest, clonePartialInvalidation) {
for (PictureLayerTiling::Iterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect(),
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ tiling->ContentRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -406,8 +402,7 @@ TEST_F(PictureLayerImplTest, noInvalidationBoundsChange) {
for (PictureLayerTiling::Iterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect(),
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ tiling->ContentRect());
iter;
++iter) {
EXPECT_TRUE(*iter);
@@ -458,8 +453,7 @@ TEST_F(PictureLayerImplTest, addTilesFromNewRecording) {
for (PictureLayerTiling::Iterator
iter(tiling,
tiling->contents_scale(),
- tiling->ContentRect(),
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ tiling->ContentRect());
iter;
++iter) {
EXPECT_FALSE(iter.full_tile_geometry_rect().IsEmpty());
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index 18ac293..09f4f285 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -137,8 +137,7 @@ void PictureLayerTiling::Invalidate(const Region& layer_invalidation) {
gfx::Rect rect =
gfx::ToEnclosingRect(ScaleRect(layer_invalidation, contents_scale_));
- for (PictureLayerTiling::Iterator tile_iter(this, contents_scale_, rect,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ for (PictureLayerTiling::Iterator tile_iter(this, contents_scale_, rect);
tile_iter;
++tile_iter) {
TileMapKey key(tile_iter.tile_i_, tile_iter.tile_j_);
@@ -185,8 +184,7 @@ PictureLayerTiling::Iterator::Iterator()
PictureLayerTiling::Iterator::Iterator(const PictureLayerTiling* tiling,
float dest_scale,
- gfx::Rect dest_rect,
- LayerDeviceAlignment layerDeviceAlignment)
+ gfx::Rect dest_rect)
: tiling_(tiling),
dest_rect_(dest_rect),
dest_to_content_scale_(0),
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index e21cf7b..7a71fa8 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -65,12 +65,6 @@ class CC_EXPORT PictureLayerTiling {
return all_tiles;
}
- enum LayerDeviceAlignment {
- LayerDeviceAlignmentUnknown,
- LayerAlignedToDevice,
- LayerNotAlignedToDevice,
- };
-
static gfx::Rect ExpandRectEquallyToAreaBoundedBy(
gfx::Rect starting_rect,
int64 target_area,
@@ -85,8 +79,7 @@ class CC_EXPORT PictureLayerTiling {
Iterator();
Iterator(const PictureLayerTiling* tiling,
float dest_scale,
- gfx::Rect rect,
- LayerDeviceAlignment layerDeviceAlignment);
+ gfx::Rect rect);
~Iterator();
// Visible rect (no borders), always in the space of content_rect,
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index 9c22ac0..0baf02d 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -110,12 +110,10 @@ PictureLayerTilingSet::Iterator::Iterator(
const PictureLayerTilingSet* set,
float contents_scale,
gfx::Rect content_rect,
- float ideal_contents_scale,
- PictureLayerTiling::LayerDeviceAlignment layerDeviceAlignment)
+ float ideal_contents_scale)
: set_(set),
contents_scale_(contents_scale),
ideal_contents_scale_(ideal_contents_scale),
- layer_device_alignment_(layerDeviceAlignment),
current_tiling_(-1) {
missing_region_.Union(content_rect);
@@ -249,8 +247,7 @@ PictureLayerTilingSet::Iterator& PictureLayerTilingSet::Iterator::operator++() {
tiling_iter_ = PictureLayerTiling::Iterator(
set_->tilings_[current_tiling_],
contents_scale_,
- last_rect,
- layer_device_alignment_);
+ last_rect);
}
return *this;
diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h
index eab4314..7a49541 100644
--- a/cc/resources/picture_layer_tiling_set.h
+++ b/cc/resources/picture_layer_tiling_set.h
@@ -74,8 +74,7 @@ class CC_EXPORT PictureLayerTilingSet {
Iterator(const PictureLayerTilingSet* set,
float contents_scale,
gfx::Rect content_rect,
- float ideal_contents_scale,
- PictureLayerTiling::LayerDeviceAlignment layerDeviceAlignment);
+ float ideal_contents_scale);
~Iterator();
// Visible rect (no borders), always in the space of rect,
@@ -100,7 +99,6 @@ class CC_EXPORT PictureLayerTilingSet {
const PictureLayerTilingSet* set_;
float contents_scale_;
float ideal_contents_scale_;
- PictureLayerTiling::LayerDeviceAlignment layer_device_alignment_;
PictureLayerTiling::Iterator tiling_iter_;
int current_tiling_;
int ideal_tiling_;
diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
index 76110b0..933b4b9 100644
--- a/cc/resources/picture_layer_tiling_set_unittest.cc
+++ b/cc/resources/picture_layer_tiling_set_unittest.cc
@@ -37,8 +37,7 @@ TEST(PictureLayerTilingSetTest, NoResources) {
&set,
contents_scale,
content_rect,
- contents_scale,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ contents_scale);
for (; iter; ++iter) {
gfx::Rect geometry_rect = iter.geometry_rect();
EXPECT_TRUE(content_rect.Contains(geometry_rect));
@@ -96,8 +95,7 @@ class PictureLayerTilingSetTestWithResources : public testing::Test {
&set,
max_contents_scale,
content_rect,
- ideal_contents_scale,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ ideal_contents_scale);
for (; iter; ++iter) {
gfx::Rect geometry_rect = iter.geometry_rect();
EXPECT_TRUE(content_rect.Contains(geometry_rect));
diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc
index 9f41b6c..ec6f2c1 100644
--- a/cc/resources/picture_layer_tiling_unittest.cc
+++ b/cc/resources/picture_layer_tiling_unittest.cc
@@ -42,8 +42,7 @@ class PictureLayerTilingIteratorTest : public testing::Test {
Region remaining = expect_rect;
for (PictureLayerTiling::Iterator iter(tiling_.get(),
rect_scale,
- request_rect,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ request_rect);
iter;
++iter) {
@@ -144,16 +143,14 @@ TEST_F(PictureLayerTilingIteratorTest, IteratorEmptyRect) {
Initialize(gfx::Size(100, 100), 1.0f, gfx::Size(800, 600));
gfx::Rect empty;
- PictureLayerTiling::Iterator iter(tiling_.get(), 1.0f, empty,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ PictureLayerTiling::Iterator iter(tiling_.get(), 1.0f, empty);
EXPECT_FALSE(iter);
}
TEST_F(PictureLayerTilingIteratorTest, NonIntersectingRect) {
Initialize(gfx::Size(100, 100), 1.0f, gfx::Size(800, 600));
gfx::Rect non_intersecting(1000, 1000, 50, 50);
- PictureLayerTiling::Iterator iter(tiling_.get(), 1, non_intersecting,
- PictureLayerTiling::LayerDeviceAlignmentUnknown);
+ PictureLayerTiling::Iterator iter(tiling_.get(), 1, non_intersecting);
EXPECT_FALSE(iter);
}
generated by cgit v1.1 at 2025-02-10 18:34:45 +0000