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

Unified Diff: cc/picture_pile_base.cc

Issue 12383060: cc: Remove texture scaling and clear edge texels of a layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and expand base picture Created 7 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/picture_pile_base.h ('k') | cc/picture_pile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/picture_pile_base.cc
diff --git a/cc/picture_pile_base.cc b/cc/picture_pile_base.cc
index c855167faf96de3539a78eadb709e26c8d10066d..08ea4ee33ca89ae9bb7e6e0949045cdb2848decd 100644
--- a/cc/picture_pile_base.cc
+++ b/cc/picture_pile_base.cc
@@ -5,6 +5,7 @@
#include "cc/picture_pile_base.h"
#include "base/logging.h"
+#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/rect_conversions.h"
namespace {
@@ -17,7 +18,8 @@ const int kTileGridBorderPixels = 1;
namespace cc {
PicturePileBase::PicturePileBase()
- : min_contents_scale_(0) {
+ : min_contents_scale_(0)
+ , background_color_(SkColorSetARGBInline(0, 0, 0, 0)) {
tiling_.SetMaxTextureSize(gfx::Size(kBasePictureSize, kBasePictureSize));
tile_grid_info_.fTileInterval.setEmpty();
tile_grid_info_.fMargin.setEmpty();
@@ -105,6 +107,7 @@ void PicturePileBase::PushPropertiesTo(PicturePileBase* other) {
other->recorded_region_ = recorded_region_;
other->min_contents_scale_ = min_contents_scale_;
other->tile_grid_info_ = tile_grid_info_;
+ other->background_color_ = background_color_;
}
void PicturePileBase::UpdateRecordedRegion() {
« no previous file with comments | « cc/picture_pile_base.h ('k') | cc/picture_pile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698