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

Unified Diff: cc/playback/drawing_display_item.cc

Issue 2646623002: cc: Remove all blimp code from cc. (Closed)
Patch Set: test build Created 3 years, 11 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/drawing_display_item.h ('k') | cc/playback/filter_display_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/drawing_display_item.cc
diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc
index 4d1b3d2a7a2776f06449eb8607e7921aad2d492b..15700830a58266573547c83e7e6e65dd6adfaa3c 100644
--- a/cc/playback/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc
@@ -12,10 +12,7 @@
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
#include "base/values.h"
-#include "cc/blimp/client_picture_cache.h"
-#include "cc/blimp/image_serialization_processor.h"
#include "cc/debug/picture_debug_util.h"
-#include "cc/proto/display_item.pb.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkData.h"
#include "third_party/skia/include/core/SkMatrix.h"
@@ -33,27 +30,6 @@ DrawingDisplayItem::DrawingDisplayItem(sk_sp<const SkPicture> picture)
SetNew(std::move(picture));
}
-DrawingDisplayItem::DrawingDisplayItem(
- const proto::DisplayItem& proto,
- ClientPictureCache* client_picture_cache,
- std::vector<uint32_t>* used_engine_picture_ids)
- : DisplayItem(DRAWING) {
- DCHECK_EQ(proto::DisplayItem::Type_Drawing, proto.type());
- DCHECK(client_picture_cache);
-
- const proto::DrawingDisplayItem& details = proto.drawing_item();
- DCHECK(details.has_id());
- const proto::SkPictureID& sk_picture_id = details.id();
- DCHECK(sk_picture_id.has_unique_id());
-
- uint32_t unique_id = sk_picture_id.unique_id();
- sk_sp<const SkPicture> picture = client_picture_cache->GetPicture(unique_id);
- DCHECK(picture);
-
- used_engine_picture_ids->push_back(unique_id);
- SetNew(std::move(picture));
-}
-
DrawingDisplayItem::DrawingDisplayItem(const DrawingDisplayItem& item)
: DisplayItem(DRAWING) {
item.CloneTo(this);
@@ -66,17 +42,6 @@ void DrawingDisplayItem::SetNew(sk_sp<const SkPicture> picture) {
picture_ = std::move(picture);
}
-void DrawingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
- TRACE_EVENT0("cc.remote", "DrawingDisplayItem::ToProtobuf");
- proto->set_type(proto::DisplayItem::Type_Drawing);
-
- if (!picture_)
- return;
-
- proto->mutable_drawing_item()->mutable_id()->set_unique_id(
- picture_->uniqueID());
-}
-
sk_sp<const SkPicture> DrawingDisplayItem::GetPicture() const {
return picture_;
}
« no previous file with comments | « cc/playback/drawing_display_item.h ('k') | cc/playback/filter_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698