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

Unified Diff: ui/gfx/compositor/layer_unittest.cc

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove dip from gyp Created 8 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
Index: ui/gfx/compositor/layer_unittest.cc
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index 65805fd6b01a3c7079f6fbb6996dd1ac843449b9..358bedda1d74fd77d6cc8e3215400d2c515e8782 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -366,7 +366,8 @@ class LayerWithDelegateTest : public testing::Test, public CompositorDelegate {
virtual void SetUp() OVERRIDE {
ui::SetupTestCompositor();
compositor_.reset(new Compositor(
- this, gfx::kNullAcceleratedWidget, gfx::Size(1000, 1000)));
+ this, gfx::kNullAcceleratedWidget));
+ compositor_->WidgetScaleOrSizeChanged(1.0f, gfx::Size(1000, 1000));
}
virtual void TearDown() OVERRIDE {
@@ -857,7 +858,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_CompositorObservers) {
// Checks that modifying the hierarchy correctly affects final composite.
TEST_F(LayerWithRealCompositorTest, MAYBE_ModifyHierarchy) {
- GetCompositor()->WidgetSizeChanged(gfx::Size(50, 50));
+ GetCompositor()->WidgetScaleOrSizeChanged(1.0f, gfx::Size(50, 50));
// l0
// +-l11
@@ -917,7 +918,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_ModifyHierarchy) {
// Opacity is rendered correctly.
// Checks that modifying the hierarchy correctly affects final composite.
TEST_F(LayerWithRealCompositorTest, MAYBE_Opacity) {
- GetCompositor()->WidgetSizeChanged(gfx::Size(50, 50));
+ GetCompositor()->WidgetScaleOrSizeChanged(1.0f, gfx::Size(50, 50));
// l0
// +-l11

Powered by Google App Engine
This is Rietveld 408576698