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

Unified Diff: cc/resources/compositing_display_item.cc

Issue 952123002: Add layer bounds to compositing_dislay_item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: !!bounds! Created 5 years, 10 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/resources/compositing_display_item.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/compositing_display_item.cc
diff --git a/cc/resources/compositing_display_item.cc b/cc/resources/compositing_display_item.cc
index ed9cbc13a715bce3855655754a79452017774efe..c33d4caeb4acdc3e8106154723a1030c2ea01add 100644
--- a/cc/resources/compositing_display_item.cc
+++ b/cc/resources/compositing_display_item.cc
@@ -15,8 +15,14 @@ namespace cc {
CompositingDisplayItem::CompositingDisplayItem(float opacity,
SkXfermode::Mode xfermode,
+ SkRect* bounds,
skia::RefPtr<SkColorFilter> cf)
- : opacity_(opacity), xfermode_(xfermode), color_filter_(cf) {
+ : opacity_(opacity),
+ xfermode_(xfermode),
+ has_bounds_(!!bounds),
+ color_filter_(cf) {
+ if (bounds)
+ bounds_ = SkRect(*bounds);
}
CompositingDisplayItem::~CompositingDisplayItem() {
@@ -28,7 +34,7 @@ void CompositingDisplayItem::Raster(SkCanvas* canvas,
paint.setXfermodeMode(xfermode_);
paint.setAlpha(opacity_ * 255);
paint.setColorFilter(color_filter_.get());
- canvas->saveLayer(NULL, &paint);
+ canvas->saveLayer(has_bounds_ ? &bounds_ : nullptr, &paint);
}
bool CompositingDisplayItem::IsSuitableForGpuRasterization() const {
@@ -41,13 +47,19 @@ int CompositingDisplayItem::ApproximateOpCount() const {
size_t CompositingDisplayItem::PictureMemoryUsage() const {
// TODO(pdr): Include color_filter's memory here.
- return sizeof(float) + sizeof(SkXfermode::Mode);
+ return sizeof(float) + sizeof(bool) + sizeof(SkRect) +
+ sizeof(SkXfermode::Mode);
}
void CompositingDisplayItem::AsValueInto(
base::trace_event::TracedValue* array) const {
array->AppendString(base::StringPrintf(
"CompositingDisplayItem opacity: %f, xfermode: %d", opacity_, xfermode_));
+ if (has_bounds_)
+ array->AppendString(base::StringPrintf(
+ ", bounds: [%f, %f, %f, %f]", static_cast<float>(bounds_.x()),
+ static_cast<float>(bounds_.y()), static_cast<float>(bounds_.width()),
+ static_cast<float>(bounds_.height())));
}
EndCompositingDisplayItem::EndCompositingDisplayItem() {
« no previous file with comments | « cc/resources/compositing_display_item.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698