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

Side by Side Diff: ui/compositor/layer_unittest.cc

Issue 375693006: Snap layers in views to physical pixel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use cc::MathUtil::Round instead Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "cc/layers/delegated_frame_provider.h" 17 #include "cc/layers/delegated_frame_provider.h"
18 #include "cc/layers/delegated_frame_resource_collection.h" 18 #include "cc/layers/delegated_frame_resource_collection.h"
19 #include "cc/layers/layer.h" 19 #include "cc/layers/layer.h"
20 #include "cc/output/copy_output_request.h" 20 #include "cc/output/copy_output_request.h"
21 #include "cc/output/copy_output_result.h" 21 #include "cc/output/copy_output_result.h"
22 #include "cc/output/delegated_frame_data.h" 22 #include "cc/output/delegated_frame_data.h"
23 #include "cc/test/pixel_test_utils.h" 23 #include "cc/test/pixel_test_utils.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #include "ui/compositor/compositor_observer.h" 25 #include "ui/compositor/compositor_observer.h"
26 #include "ui/compositor/dip_util.h"
26 #include "ui/compositor/layer.h" 27 #include "ui/compositor/layer.h"
27 #include "ui/compositor/layer_animation_sequence.h" 28 #include "ui/compositor/layer_animation_sequence.h"
28 #include "ui/compositor/layer_animator.h" 29 #include "ui/compositor/layer_animator.h"
29 #include "ui/compositor/test/context_factories_for_test.h" 30 #include "ui/compositor/test/context_factories_for_test.h"
30 #include "ui/compositor/test/draw_waiter_for_test.h" 31 #include "ui/compositor/test/draw_waiter_for_test.h"
31 #include "ui/compositor/test/test_compositor_host.h" 32 #include "ui/compositor/test/test_compositor_host.h"
32 #include "ui/compositor/test/test_layers.h" 33 #include "ui/compositor/test/test_layers.h"
33 #include "ui/gfx/canvas.h" 34 #include "ui/gfx/canvas.h"
34 #include "ui/gfx/codec/png_codec.h" 35 #include "ui/gfx/codec/png_codec.h"
35 #include "ui/gfx/gfx_paths.h" 36 #include "ui/gfx/gfx_paths.h"
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 compositor()->SetRootLayer(root.get()); 1548 compositor()->SetRootLayer(root.get());
1548 1549
1549 child->SetAnimator(LayerAnimator::CreateImplicitAnimator()); 1550 child->SetAnimator(LayerAnimator::CreateImplicitAnimator());
1550 child->SetOpacity(0.5f); 1551 child->SetOpacity(0.5f);
1551 EXPECT_TRUE(compositor()->layer_animator_collection()->HasActiveAnimators()); 1552 EXPECT_TRUE(compositor()->layer_animator_collection()->HasActiveAnimators());
1552 1553
1553 child.reset(); 1554 child.reset();
1554 EXPECT_FALSE(compositor()->layer_animator_collection()->HasActiveAnimators()); 1555 EXPECT_FALSE(compositor()->layer_animator_collection()->HasActiveAnimators());
1555 } 1556 }
1556 1557
1558 namespace {
1559
1560 std::string Vector2dFTo100thPercisionString(const gfx::Vector2dF& vector) {
1561 return base::StringPrintf("%.2f %0.2f", vector.x(), vector.y());
1562 }
1563
1564 } // namespace
1565
1566 TEST_F(LayerWithRealCompositorTest, SnapLayerToPixels) {
1567 scoped_ptr<Layer> root(CreateLayer(LAYER_TEXTURED));
1568 scoped_ptr<Layer> c1(CreateLayer(LAYER_TEXTURED));
1569 scoped_ptr<Layer> c11(CreateLayer(LAYER_TEXTURED));
1570
1571 GetCompositor()->SetScaleAndSize(1.25f, gfx::Size(100, 100));
1572 GetCompositor()->SetRootLayer(root.get());
1573 root->Add(c1.get());
1574 c1->Add(c11.get());
1575
1576 root->SetBounds(gfx::Rect(0, 0, 100, 100));
1577 c1->SetBounds(gfx::Rect(1, 1, 10, 10));
1578 c11->SetBounds(gfx::Rect(1, 1, 10, 10));
1579 SnapLayerToPhysicalPixelBoundary(root.get(), c11.get());
1580 // 0.5 at 1.25 scale : (1 - 0.25 + 0.25) / 1.25 = 0.4
1581 EXPECT_EQ("0.40 0.40",
1582 Vector2dFTo100thPercisionString(c11->subpixel_position_offset()));
1583
1584 GetCompositor()->SetScaleAndSize(1.5f, gfx::Size(100, 100));
1585 SnapLayerToPhysicalPixelBoundary(root.get(), c11.get());
1586 // c11 must already be aligned at 1.5 scale.
1587 EXPECT_EQ("0.00 0.00",
1588 Vector2dFTo100thPercisionString(c11->subpixel_position_offset()));
1589
1590 c11->SetBounds(gfx::Rect(2, 2, 10, 10));
1591 SnapLayerToPhysicalPixelBoundary(root.get(), c11.get());
1592 // c11 is now off the pixel.
1593 // 0.5 / 1.5 = 0.333...
1594 EXPECT_EQ("0.33 0.33",
1595 Vector2dFTo100thPercisionString(c11->subpixel_position_offset()));
1596 }
1597
1557 } // namespace ui 1598 } // namespace ui
OLDNEW
« ui/compositor/dip_util.cc ('K') | « ui/compositor/layer_owner.cc ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698