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

Unified Diff: cc/playback/display_item_list_unittest.cc

Issue 2747273002: cc: Remove AsValue virtual from DisplayItem. (Closed)
Patch Set: Created 3 years, 9 months 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
« no previous file with comments | « cc/playback/display_item_list.cc ('k') | cc/playback/drawing_display_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/display_item_list_unittest.cc
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 426371e6bd85935cfe107fa7c958243eab78952d..46e8800687d894601449649042cfbd60ef6233c6 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -9,6 +9,7 @@
#include <vector>
#include "base/memory/ptr_util.h"
+#include "base/trace_event/trace_event_argument.h"
#include "cc/output/filter_operation.h"
#include "cc/output/filter_operations.h"
#include "cc/paint/paint_canvas.h"
@@ -317,13 +318,13 @@ TEST(DisplayItemListTest, AsValueWithNoItems) {
list->SetRetainVisualRectsForTesting(true);
list->Finalize();
- std::string value = list->AsValue(true)->ToString();
+ std::string value = list->CreateTracedValue(true)->ToString();
EXPECT_EQ(value.find("\"layer_rect\": [0,0,0,0]"), std::string::npos);
EXPECT_NE(value.find("\"items\":[]"), std::string::npos);
EXPECT_EQ(value.find("visualRect: [0,0 42x42]"), std::string::npos);
EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
- value = list->AsValue(false)->ToString();
+ value = list->CreateTracedValue(false)->ToString();
EXPECT_EQ(value.find("\"layer_rect\": [0,0,0,0]"), std::string::npos);
EXPECT_EQ(value.find("\"items\":"), std::string::npos);
EXPECT_EQ(value.find("visualRect: [0,0 42x42]"), std::string::npos);
@@ -341,14 +342,14 @@ TEST(DisplayItemListTest, AsValueWithItems) {
list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
list->Finalize();
- std::string value = list->AsValue(true)->ToString();
+ std::string value = list->CreateTracedValue(true)->ToString();
EXPECT_EQ(value.find("\"layer_rect\": [0,0,42,42]"), std::string::npos);
EXPECT_NE(value.find("{\"items\":[\"TransformDisplayItem"),
std::string::npos);
EXPECT_NE(value.find("visualRect: [0,0 42x42]"), std::string::npos);
EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
- value = list->AsValue(false)->ToString();
+ value = list->CreateTracedValue(false)->ToString();
EXPECT_EQ(value.find("\"layer_rect\": [0,0,42,42]"), std::string::npos);
EXPECT_EQ(value.find("{\"items\":[\"TransformDisplayItem"),
std::string::npos);
« no previous file with comments | « cc/playback/display_item_list.cc ('k') | cc/playback/drawing_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698