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

Unified Diff: ui/views/view.cc

Issue 2188133002: Scroll with Layers in views::ScrollView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-ScrollTrack
Patch Set: Add a test for the transform goop Created 4 years, 4 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
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index be3bbf5b7ed29370ae2f344bf04420ee029dbe93..b2c3c0b33f3686adb79c04e481343dd73d2beca5 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -447,7 +447,13 @@ void View::OnEnabledChanged() {
// Transformations -------------------------------------------------------------
gfx::Transform View::GetTransform() const {
tapted 2016/08/05 07:12:31 This is new since patchset 8 too. Without it event
- return layer() ? layer()->transform() : gfx::Transform();
+ if (!layer())
+ return gfx::Transform();
+
+ gfx::Transform transform = layer()->transform();
+ gfx::ScrollOffset scroll_offset = layer()->CurrentScrollOffset();
+ transform.Translate(-scroll_offset.x(), -scroll_offset.y());
+ return transform;
}
void View::SetTransform(const gfx::Transform& transform) {
« ui/views/controls/scroll_view_unittest.cc ('K') | « ui/views/controls/scroll_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698