summaryrefslogtreecommitdiffstats
path: root/cc/playback/display_list_raster_source_unittest.cc
diff options
context:
space:
mode:
authorjbroman <jbroman@chromium.org>2015-07-16 14:40:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-16 21:41:27 +0000
commit9f60f1ab2cfc83b0eef94c5be0db2b24383bdd17 (patch)
treee7beb3093d6bc7d87341aa72e2053dff0dfdff67 /cc/playback/display_list_raster_source_unittest.cc
parent274a945f5bd2fb60c2dc22c2bfeaa0a4d4d48e15 (diff)
downloadchromium_src-9f60f1ab2cfc83b0eef94c5be0db2b24383bdd17.zip
chromium_src-9f60f1ab2cfc83b0eef94c5be0db2b24383bdd17.tar.gz
chromium_src-9f60f1ab2cfc83b0eef94c5be0db2b24383bdd17.tar.bz2
cc: Plumb Blink-reported memory usage to raster source.
BUG=481083 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1236773006 Cr-Commit-Position: refs/heads/master@{#339129}
Diffstat (limited to 'cc/playback/display_list_raster_source_unittest.cc')
-rw-r--r--cc/playback/display_list_raster_source_unittest.cc17
1 files changed, 17 insertions, 0 deletions
diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc
index d936af5..6cb201b 100644
--- a/cc/playback/display_list_raster_source_unittest.cc
+++ b/cc/playback/display_list_raster_source_unittest.cc
@@ -552,5 +552,22 @@ TEST(DisplayListRasterSourceTest, RasterContentsTransparent) {
}
}
+TEST(DisplayListRasterSourceTest,
+ GetPictureMemoryUsageIncludesClientReportedMemory) {
+ const size_t kReportedMemoryUsageInBytes = 100 * 1024 * 1024;
+ gfx::Size layer_bounds(5, 3);
+ scoped_ptr<FakeDisplayListRecordingSource> recording_source =
+ FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
+ recording_source->set_reported_memory_usage(kReportedMemoryUsageInBytes);
+ recording_source->Rerecord();
+
+ scoped_refptr<DisplayListRasterSource> raster =
+ DisplayListRasterSource::CreateFromDisplayListRecordingSource(
+ recording_source.get(), false);
+ size_t total_memory_usage = raster->GetPictureMemoryUsage();
+ EXPECT_GE(total_memory_usage, kReportedMemoryUsageInBytes);
+ EXPECT_LT(total_memory_usage, 2 * kReportedMemoryUsageInBytes);
+}
+
} // namespace
} // namespace cc