Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3059)

Unified Diff: cc/test/fake_display_list_recording_source.cc

Issue 1527863002: Serialize PictureLayer properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/proto/layer.proto ('K') | « cc/proto/layer.proto ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_display_list_recording_source.cc
diff --git a/cc/test/fake_display_list_recording_source.cc b/cc/test/fake_display_list_recording_source.cc
index fe0a1270e9c21a1622a41a898f36510857f514bf..01e6048527c256c40df999ac1d9856740da78785 100644
--- a/cc/test/fake_display_list_recording_source.cc
+++ b/cc/test/fake_display_list_recording_source.cc
@@ -27,6 +27,14 @@ FakeDisplayListRecordingSource::CreateRasterSource(bool can_use_lcd) const {
bool FakeDisplayListRecordingSource::EqualsTo(
const FakeDisplayListRecordingSource& other) {
+ // The DisplayItemLists are equal if they are both null or they are both not
+ // null and render to the same thing.
+ bool display_lists_equal = !display_list_ && !other.display_list_;
+ if (display_list_ && other.display_list_) {
+ display_lists_equal = AreDisplayListDrawingResultsSame(
+ recorded_viewport_, display_list_, other.display_list_);
+ }
+
return recorded_viewport_ == other.recorded_viewport_ &&
size_ == other.size_ &&
slow_down_raster_scale_factor_for_debug_ ==
@@ -38,9 +46,7 @@ bool FakeDisplayListRecordingSource::EqualsTo(
clear_canvas_with_debug_color_ ==
other.clear_canvas_with_debug_color_ &&
solid_color_ == other.solid_color_ &&
- background_color_ == other.background_color_ &&
- AreDisplayListDrawingResultsSame(recorded_viewport_, display_list_,
- other.display_list_);
+ background_color_ == other.background_color_ && display_lists_equal;
}
} // namespace cc
« cc/proto/layer.proto ('K') | « cc/proto/layer.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698