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

Unified Diff: ui/compositor/layer.cc

Issue 13042012: Browser side changes for software compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 5e5ebcb95a7bd577e18d170fa373af0aa25a0e27..f3f458cb62445a048080fd7240e8c71301029c49 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -546,7 +546,7 @@ void Layer::SetColor(SkColor color) {
}
bool Layer::SchedulePaint(const gfx::Rect& invalid_rect) {
- if (type_ == LAYER_SOLID_COLOR || (!delegate_ && !texture_))
+ if (type_ == LAYER_SOLID_COLOR)
return false;
damaged_region_.op(invalid_rect.x(),
@@ -565,21 +565,19 @@ void Layer::ScheduleDraw() {
}
void Layer::SendDamagedRects() {
- if ((delegate_ || texture_) && !damaged_region_.isEmpty()) {
piman 2013/04/05 21:07:29 The whole point of this logic is that we don't wan
- for (SkRegion::Iterator iter(damaged_region_);
- !iter.done(); iter.next()) {
- const SkIRect& sk_damaged = iter.rect();
- gfx::Rect damaged(
- sk_damaged.x(),
- sk_damaged.y(),
- sk_damaged.width(),
- sk_damaged.height());
-
- gfx::Rect damaged_in_pixel = ConvertRectToPixel(this, damaged);
- cc_layer_->SetNeedsDisplayRect(damaged_in_pixel);
- }
- damaged_region_.setEmpty();
+ for (SkRegion::Iterator iter(damaged_region_);
+ !iter.done(); iter.next()) {
+ const SkIRect& sk_damaged = iter.rect();
+ gfx::Rect damaged(
+ sk_damaged.x(),
+ sk_damaged.y(),
+ sk_damaged.width(),
+ sk_damaged.height());
+
+ gfx::Rect damaged_in_pixel = ConvertRectToPixel(this, damaged);
+ cc_layer_->SetNeedsDisplayRect(damaged_in_pixel);
}
+ damaged_region_.setEmpty();
for (size_t i = 0; i < children_.size(); ++i)
children_[i]->SendDamagedRects();
}
« no previous file with comments | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698