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

Unified Diff: cc/layers/ui_resource_layer.cc

Issue 82553015: Switch the android overscroll glow to use UIResources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor naming changes Created 7 years, 1 month 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
Index: cc/layers/ui_resource_layer.cc
diff --git a/cc/layers/ui_resource_layer.cc b/cc/layers/ui_resource_layer.cc
index 09b8d9af4cc997b173111cfc2bc44f2fe67f5b22..3f6bb5dd5badfc8db4d9cc5a34ab0a03af997815 100644
--- a/cc/layers/ui_resource_layer.cc
+++ b/cc/layers/ui_resource_layer.cc
@@ -56,7 +56,7 @@ scoped_refptr<UIResourceLayer> UIResourceLayer::Create() {
}
UIResourceLayer::UIResourceLayer()
- : Layer(),
+ : ContentsScalingLayer(),
uv_top_left_(0.f, 0.f),
uv_bottom_right_(1.f, 1.f) {
vertex_opacity_[0] = 1.0f;
@@ -162,4 +162,20 @@ void UIResourceLayer::PushPropertiesTo(LayerImpl* layer) {
}
}
+void UIResourceLayer::CalculateContentsScale(float ideal_contents_scale,
+ float device_scale_factor,
+ float page_scale_factor,
+ bool animating_transform_to_screen,
+ float* contents_scale_x,
+ float* contents_scale_y,
+ gfx::Size* content_bounds) {
+ if (!layer_tree_host() || !ui_resource_holder_ || !ui_resource_holder_->id())
+ return;
+ *contents_scale_x = 1.f;
+ *contents_scale_y = 1.f;
+ gfx::Size image_size =
+ layer_tree_host()->GetUIResourceSize(ui_resource_holder_->id());
+ *content_bounds = image_size;
+}
+
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698