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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_gl.cc

Issue 2966793002: NOT FOR REVIEW - convert to cc animation
Patch Set: switch to transform operations Created 3 years, 6 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 | « chrome/browser/android/vr_shell/ui_scene_unittest.cc ('k') | ui/gfx/animation/tween.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_shell_gl.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc
index aa9613251d39a6d36704f37d039ecf75d0de052f..9fdde5e9ade1219a52db7652caa5464cffa097fc 100644
--- a/chrome/browser/android/vr_shell/vr_shell_gl.cc
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc
@@ -1299,7 +1299,8 @@ void VrShellGl::DrawElements(const gfx::Transform& view_proj_matrix,
void VrShellGl::DrawElement(const gfx::Transform& view_proj_matrix,
const UiElement& element) {
- gfx::Transform transform = view_proj_matrix * element.transform();
+ gfx::Transform transform =
+ view_proj_matrix * element.screen_space_transform();
switch (element.fill()) {
case Fill::OPAQUE_GRADIENT: {
@@ -1347,8 +1348,8 @@ std::vector<const UiElement*> VrShellGl::GetElementsInDrawOrder(
if (first->draw_phase() != second->draw_phase()) {
return first->draw_phase() < second->draw_phase();
} else {
- return first->transform().matrix().get(2, 3) <
- second->transform().matrix().get(2, 3);
+ return first->screen_space_transform().matrix().get(2, 3) <
+ second->screen_space_transform().matrix().get(2, 3);
}
});
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene_unittest.cc ('k') | ui/gfx/animation/tween.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698