Removes the rotation and scaling in SnapshotAura.

ui/snapshot/snapshot_aura_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/snapshot/snapshot.h"
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace ui {
 namespace {
-const SkColor kPaintColor = SK_ColorRED;
+
+SkColor GetExpectedColorForPoint(int x, int y) {
+  return SkColorSetRGB(std::min(x, 255), std::min(y, 255), 0);
+}
 
 // Paint simple rectangle on the specified aura window.
 class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate {
  public:
   explicit TestPaintingWindowDelegate(const gfx::Size& window_size)
       : window_size_(window_size) {
   }
 
   virtual ~TestPaintingWindowDelegate() {
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    canvas->FillRect(gfx::Rect(window_size_), kPaintColor);
+    for (int y = 0; y < window_size_.height(); ++y) {
+      for (int x = 0; x < window_size_.width(); ++x)
+        canvas->FillRect(gfx::Rect(x, y, 1, 1), GetExpectedColorForPoint(x, y));
+    }
   }
 
  private:
   gfx::Size window_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPaintingWindowDelegate);
 };
 
-size_t GetFailedPixelsCount(const gfx::Image& image) {
+size_t GetFailedPixelsCountWithScaleFactor(const gfx::Image& image,
+                                           int scale_factor) {
   const SkBitmap* bitmap = image.ToSkBitmap();
   uint32* bitmap_data = reinterpret_cast<uint32*>(
       bitmap->pixelRef()->pixels());
   size_t result = 0;
-  for (int i = 0; i < bitmap->width() * bitmap->height(); ++i) {
-    if (static_cast<SkColor>(bitmap_data[i]) != kPaintColor)
-      ++result;
+  for (int y = 0; y < bitmap->height(); y += scale_factor) {
+    for (int x = 0; x < bitmap->width(); x += scale_factor) {
+      if (static_cast<SkColor>(bitmap_data[x + y * bitmap->width()]) !=
+          GetExpectedColorForPoint(x / scale_factor, y / scale_factor)) {
+        ++result;
+      }
+    }
   }
   return result;
 }
 
+size_t GetFailedPixelsCount(const gfx::Image& image) {
+  return GetFailedPixelsCountWithScaleFactor(image, 1);
+}
+
 }  // namespace
 
 class SnapshotAuraTest : public testing::Test {
  public:
   SnapshotAuraTest() {}
   virtual ~SnapshotAuraTest() {}
 
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
     helper_.reset(
@@ skipping 97 matching lines @@
             snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
 }
 
 TEST_F(SnapshotAuraTest, PartialBounds) {
   gfx::Rect test_bounds(100, 100, 300, 200);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
-  EXPECT_EQ(test_bounds.size().ToString(),
-            snapshot.Size().ToString());
+  EXPECT_EQ(test_bounds.size().ToString(), snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
 }
 
 TEST_F(SnapshotAuraTest, Rotated) {
   test_screen()->SetDisplayRotation(gfx::Display::ROTATE_90);
 
   gfx::Rect test_bounds(100, 100, 300, 200);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
-  EXPECT_EQ(test_bounds.size().ToString(),
-            snapshot.Size().ToString());
+  EXPECT_EQ(test_bounds.size().ToString(), snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
 }
 
 TEST_F(SnapshotAuraTest, UIScale) {
   const float kUIScale = 1.25f;
   test_screen()->SetUIScale(kUIScale);
 
   gfx::Rect test_bounds(100, 100, 300, 200);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   // Snapshot always captures the physical pixels.
   gfx::SizeF snapshot_size(test_bounds.size());
-  snapshot_size.Scale(1.0f / kUIScale);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
 }
 
 TEST_F(SnapshotAuraTest, DeviceScaleFactor) {
   test_screen()->SetDeviceScaleFactor(2.0f);
 
   gfx::Rect test_bounds(100, 100, 150, 100);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   // Snapshot always captures the physical pixels.
   gfx::SizeF snapshot_size(test_bounds.size());
   snapshot_size.Scale(2.0f);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
-  EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
+  EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2));
 }
 
 TEST_F(SnapshotAuraTest, RotateAndUIScale) {
   const float kUIScale = 1.25f;
   test_screen()->SetUIScale(kUIScale);
   test_screen()->SetDisplayRotation(gfx::Display::ROTATE_90);
 
   gfx::Rect test_bounds(100, 100, 300, 200);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   // Snapshot always captures the physical pixels.
   gfx::SizeF snapshot_size(test_bounds.size());
-  snapshot_size.Scale(1.0f / kUIScale);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
 }
 
 TEST_F(SnapshotAuraTest, RotateAndUIScaleAndScaleFactor) {
   test_screen()->SetDeviceScaleFactor(2.0f);
   const float kUIScale = 1.25f;
   test_screen()->SetUIScale(kUIScale);
   test_screen()->SetDisplayRotation(gfx::Display::ROTATE_90);
 
   gfx::Rect test_bounds(20, 30, 150, 100);
   SetupTestWindow(test_bounds);
   WaitForDraw();
 
   // Snapshot always captures the physical pixels.
   gfx::SizeF snapshot_size(test_bounds.size());
-  snapshot_size.Scale(2.0f / kUIScale);
+  snapshot_size.Scale(2.0f);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
-  EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
+  EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2));
 }
 
 }  // namespace ui