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

Unified Diff: cc/playback/clip_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/clip_display_item.h ('k') | cc/playback/clip_path_display_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/clip_display_item.cc
diff --git a/cc/playback/clip_display_item.cc b/cc/playback/clip_display_item.cc
index 0d7b801174859c5f916de55d1bb8773360b2df51..4b4f0df4a23649be1849706a883c0a5a5e1e7ecd 100644
--- a/cc/playback/clip_display_item.cc
+++ b/cc/playback/clip_display_item.cc
@@ -11,9 +11,6 @@
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event_argument.h"
-#include "cc/proto/display_item.pb.h"
-#include "cc/proto/gfx_conversions.h"
-#include "cc/proto/skia_conversions.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/gfx/skia_util.h"
@@ -27,21 +24,6 @@ ClipDisplayItem::ClipDisplayItem(const gfx::Rect& clip_rect,
SetNew(clip_rect, rounded_clip_rects, antialias);
}
-ClipDisplayItem::ClipDisplayItem(const proto::DisplayItem& proto)
- : DisplayItem(CLIP) {
- DCHECK_EQ(proto::DisplayItem::Type_Clip, proto.type());
-
- const proto::ClipDisplayItem& details = proto.clip_item();
- gfx::Rect clip_rect = ProtoToRect(details.clip_rect());
- std::vector<SkRRect> rounded_clip_rects;
- rounded_clip_rects.reserve(details.rounded_rects_size());
- for (int i = 0; i < details.rounded_rects_size(); i++) {
- rounded_clip_rects.push_back(ProtoToSkRRect(details.rounded_rects(i)));
- }
- bool antialias = details.antialias();
- SetNew(clip_rect, rounded_clip_rects, antialias);
-}
-
void ClipDisplayItem::SetNew(const gfx::Rect& clip_rect,
const std::vector<SkRRect>& rounded_clip_rects,
bool antialias) {
@@ -52,18 +34,6 @@ void ClipDisplayItem::SetNew(const gfx::Rect& clip_rect,
ClipDisplayItem::~ClipDisplayItem() {}
-void ClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
- proto->set_type(proto::DisplayItem::Type_Clip);
-
- proto::ClipDisplayItem* details = proto->mutable_clip_item();
- RectToProto(clip_rect_, details->mutable_clip_rect());
- DCHECK_EQ(0, details->rounded_rects_size());
- for (const auto& rrect : rounded_clip_rects_) {
- SkRRectToProto(rrect, details->add_rounded_rects());
- }
- details->set_antialias(antialias_);
-}
-
void ClipDisplayItem::Raster(SkCanvas* canvas,
SkPicture::AbortCallback* callback) const {
canvas->save();
@@ -107,18 +77,9 @@ void ClipDisplayItem::AsValueInto(const gfx::Rect& visual_rect,
EndClipDisplayItem::EndClipDisplayItem() : DisplayItem(END_CLIP) {}
-EndClipDisplayItem::EndClipDisplayItem(const proto::DisplayItem& proto)
- : DisplayItem(END_CLIP) {
- DCHECK_EQ(proto::DisplayItem::Type_EndClip, proto.type());
-}
-
EndClipDisplayItem::~EndClipDisplayItem() {
}
-void EndClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
- proto->set_type(proto::DisplayItem::Type_EndClip);
-}
-
void EndClipDisplayItem::Raster(SkCanvas* canvas,
SkPicture::AbortCallback* callback) const {
canvas->restore();
« no previous file with comments | « cc/playback/clip_display_item.h ('k') | cc/playback/clip_path_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698