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

Unified Diff: ash/ash_root_window_transformer.cc

Issue 14361002: Use GetInverse (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « ash/ash_root_window_transformer.h ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash_root_window_transformer.cc
diff --git a/ash/ash_root_window_transformer.cc b/ash/ash_root_window_transformer.cc
index d71b3dc8c7c65dfe84e848e5d287d278855afe77..2cfb01926e3a9aaad7ca77432b8017a1b24480da 100644
--- a/ash/ash_root_window_transformer.cc
+++ b/ash/ash_root_window_transformer.cc
@@ -13,7 +13,6 @@ namespace ash {
AshRootWindowTransformer::AshRootWindowTransformer(
aura::RootWindow* root,
const gfx::Transform& transform,
- const gfx::Transform& inverted,
const gfx::Insets& host_insets,
float root_window_scale)
: root_window_(root),
@@ -23,20 +22,18 @@ AshRootWindowTransformer::AshRootWindowTransformer(
root_window_->layer()->SetForceRenderSurface(root_window_scale_ != 1.0f);
gfx::Transform translate;
- invert_transform_ = inverted;
- invert_transform_.Scale(root_window_scale_, root_window_scale_);
if (host_insets.top() != 0 || host_insets.left() != 0) {
float device_scale_factor = ui::GetDeviceScaleFactor(root_window_->layer());
float x_offset = host_insets.left() / device_scale_factor;
float y_offset = host_insets.top() / device_scale_factor;
translate.Translate(x_offset, y_offset);
- invert_transform_.Translate(-x_offset, -y_offset);
}
float inverted_scale = 1.0f / root_window_scale_;
translate.Scale(inverted_scale, inverted_scale);
-
transform_ = translate * transform;
+
+ CHECK(transform_.GetInverse(&invert_transform_));
}
gfx::Transform AshRootWindowTransformer::GetTransform() const {
« no previous file with comments | « ash/ash_root_window_transformer.h ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698