diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 01:15:54 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 01:15:54 +0000 |
commit | ac1d20a0ba81deccca895406f85fa4af71657647 (patch) | |
tree | 33e0e6c35864200c051d5113431fe97aa9865f33 /cc/picture_layer_impl.cc | |
parent | 4c7a383b1649e488e024ea02cd31f8b3b0a24bd2 (diff) | |
download | chromium_src-ac1d20a0ba81deccca895406f85fa4af71657647.zip chromium_src-ac1d20a0ba81deccca895406f85fa4af71657647.tar.gz chromium_src-ac1d20a0ba81deccca895406f85fa4af71657647.tar.bz2 |
cc: Apply contents scales to impl-side painting rasterization
Tiles now have a contents scale that they are rastered with, so that non-1.0
contents scales work. Additionally, PictureLayer derives from
ContentsScalingLayer so that it picks up the right content bounds and default
contents scale.
BUG=155209
Review URL: https://chromiumcodereview.appspot.com/11421210
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/picture_layer_impl.cc')
-rw-r--r-- | cc/picture_layer_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc index 093e7d4..9a9c043 100644 --- a/cc/picture_layer_impl.cc +++ b/cc/picture_layer_impl.cc @@ -160,7 +160,7 @@ void PictureLayerImpl::didUpdateTransforms() { last_content_scale_y_ = contentsScaleY(); } -scoped_refptr<Tile> PictureLayerImpl::CreateTile(PictureLayerTiling*, +scoped_refptr<Tile> PictureLayerImpl::CreateTile(PictureLayerTiling* tiling, gfx::Rect rect) { TileManager* tile_manager = layerTreeHostImpl()->tileManager(); @@ -169,7 +169,8 @@ scoped_refptr<Tile> PictureLayerImpl::CreateTile(PictureLayerTiling*, pile_.get(), rect.size(), GL_RGBA, - rect)); + rect, + tiling->contents_scale())); } void PictureLayerImpl::SyncFromActiveLayer(const PictureLayerImpl* other) { |