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

Unified Diff: cc/playback/clip_path_display_item.cc

Issue 1460503004: Add support for converting cc::Region to and from protobuf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-more-conversions
Patch Set: Sad missing brackets Created 5 years, 1 month 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
Index: cc/playback/clip_path_display_item.cc
diff --git a/cc/playback/clip_path_display_item.cc b/cc/playback/clip_path_display_item.cc
index 3b4662107055df1b01080736d6d001962ad42928..a5037a21b073f65debc3ebe76ebfabbe62d16429 100644
--- a/cc/playback/clip_path_display_item.cc
+++ b/cc/playback/clip_path_display_item.cc
@@ -41,9 +41,9 @@ void ClipPathDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
// Just use skia's serialization method for the SkPath for now.
size_t path_size = clip_path_.writeToMemory(nullptr);
if (path_size > 0) {
- scoped_ptr<char[]> buffer(new char[path_size]);
+ scoped_ptr<uint8_t[]> buffer(new uint8_t[path_size]);
clip_path_.writeToMemory(buffer.get());
- details->set_clip_path(std::string(buffer.get(), path_size));
+ details->set_clip_path(buffer.get(), path_size);
}
}
@@ -56,7 +56,7 @@ void ClipPathDisplayItem::FromProtobuf(const proto::DisplayItem& proto) {
SkPath clip_path;
if (details.has_clip_path()) {
- size_t bytes_read = clip_path.readFromMemory(details.clip_path().c_str(),
+ size_t bytes_read = clip_path.readFromMemory(details.clip_path().data(),
details.clip_path().size());
DCHECK_EQ(details.clip_path().size(), bytes_read);
}
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/proto/BUILD.gn » ('j') | cc/proto/cc_conversions_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698