Shadows: crop corner tiles instead of hiding.

ui/wm/core/shadow_unittest.cc

+// Copyright 2014 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/wm/core/shadow.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/test_windows.h"
+#include "ui/aura/window.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/layer.h"
+#include "ui/compositor/layer_tree_owner.h"
+#include "ui/resources/grit/ui_resources.h"
+
+namespace wm {
+
+static const int kSmallBitmapSize = 129;
+static const int kLargeBitmapSize = 269;

[oshima, 2014/09/19 14:24:02]

nit: put them in anonymous namespace and remove static

[hshi1, 2014/09/19 14:47:35]

Done.

+
+// Mock for the ResourceBundle::Delegate class.
+class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
+ public:
+  MockResourceBundleDelegate() : last_resource_id_(0) {
+    SkBitmap bitmap_small, bitmap_large;
+    bitmap_small.allocPixels(
+        SkImageInfo::MakeN32Premul(kSmallBitmapSize, kSmallBitmapSize));
+    bitmap_large.allocPixels(
+        SkImageInfo::MakeN32Premul(kLargeBitmapSize, kLargeBitmapSize));
+    image_small_ = gfx::Image::CreateFrom1xBitmap(bitmap_small);
+    image_large_ = gfx::Image::CreateFrom1xBitmap(bitmap_large);
+  }
+  virtual ~MockResourceBundleDelegate() {}
+
+  // ResourceBundle::Delegate overrides.

[oshima, 2014/09/19 14:24:02]

just // ResourceBundle::Delegate:

(overrdies. is no longer necessary)

[hshi1, 2014/09/19 14:47:35]

Done.

+  virtual base::FilePath GetPathForResourcePack(
+      const base::FilePath& pack_path,
+      ui::ScaleFactor scale_factor) OVERRIDE {
+    return base::FilePath();
+  }
+  virtual base::FilePath GetPathForLocalePack(
+      const base::FilePath& pack_path,
+      const std::string& locale) OVERRIDE {
+    return base::FilePath();
+  }
+  virtual gfx::Image GetImageNamed(int resource_id) OVERRIDE {
+    last_resource_id_ = resource_id;
+    switch (resource_id) {
+      case IDR_WINDOW_BUBBLE_SHADOW_SMALL:
+        return image_small_;
+      case IDR_AURA_SHADOW_ACTIVE:
+      case IDR_AURA_SHADOW_INACTIVE:
+        return image_large_;
+      default:
+        NOTREACHED();
+        return gfx::Image();
+    }
+  }
+  virtual gfx::Image GetNativeImageNamed(
+      int resource_id, ui::ResourceBundle::ImageRTL rtl) OVERRIDE {
+    return gfx::Image();
+  }
+  virtual base::RefCountedStaticMemory* LoadDataResourceBytes(
+      int resource_id, ui::ScaleFactor scale_factor) OVERRIDE {
+    return NULL;
+  }
+  virtual bool GetRawDataResource(
+      int resource_id, ui::ScaleFactor scale_factor,
+      base::StringPiece* value) OVERRIDE {
+    return false;
+  }
+  virtual bool GetLocalizedString(
+      int message_id, base::string16* value) OVERRIDE {
+    return false;
+  }
+  virtual scoped_ptr<gfx::Font> GetFont(
+      ui::ResourceBundle::FontStyle style) OVERRIDE {
+    return scoped_ptr<gfx::Font>();
+  }
+
+ int last_resource_id() const { return last_resource_id_; }

[oshima, 2014/09/19 14:24:02]

nit: indent

[hshi1, 2014/09/19 14:47:35]

Done.

+
+ private:
+  gfx::Image image_small_;
+  gfx::Image image_large_;
+  int last_resource_id_;
+};

[oshima, 2014/09/19 14:24:02]

DISALLOW_COPY_AND_ASSIGN

[hshi1, 2014/09/19 14:47:35]

Done.

+
+class ShadowTest: public aura::test::AuraTestBase {
+ public:
+  ShadowTest() {}
+  virtual ~ShadowTest() {}
+
+  MockResourceBundleDelegate* delegate() const { return delegate_.get(); }
+

[oshima, 2014/09/19 14:24:01]

nit: // aura::test:AuraTestBase:

[hshi1, 2014/09/19 14:47:35]

Done.

+  virtual void SetUp() OVERRIDE {
+    aura::test::AuraTestBase::SetUp();
+    delegate_.reset(new MockResourceBundleDelegate());
+    if (ResourceBundle::HasSharedInstance())
+      ui::ResourceBundle::CleanupSharedInstance();
+    ui::ResourceBundle::InitSharedInstanceWithLocale(
+        "en-US", delegate(), ui::ResourceBundle::LOAD_COMMON_RESOURCES);
+  }
+  virtual void TearDown() OVERRIDE {
+    ui::ResourceBundle::CleanupSharedInstance();

[oshima, 2014/09/19 14:24:01]

You need

base::FilePath ui_test_pak_path;
ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));   
ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);

as in ui/wm/test/run_all_unittest.cc.

It's probably passing now but, it's just because next tests are not using
resources.

[hshi1, 2014/09/19 14:47:35]

Ok but it requires me to add "+ui/base/ui_base_paths.h" to DEPS

+    aura::test::AuraTestBase::TearDown();
+  }
+ private:
+  scoped_ptr<MockResourceBundleDelegate> delegate_;
+};

[oshima, 2014/09/19 14:24:01]

private: DISALLOW_COPY_AND_ASSIGN

[hshi1, 2014/09/19 14:47:35]

Done.

+
+// Test if the proper image is set for the specified style.
+TEST_F(ShadowTest, UpdateImagesForStyle) {
+  scoped_ptr<Shadow> shadow(new Shadow());
+
+  shadow->Init(Shadow::STYLE_SMALL);
+  EXPECT_EQ(delegate()->last_resource_id(), IDR_WINDOW_BUBBLE_SHADOW_SMALL);
+  shadow->SetStyle(Shadow::STYLE_ACTIVE);
+  EXPECT_EQ(delegate()->last_resource_id(), IDR_AURA_SHADOW_ACTIVE);
+  shadow->SetStyle(Shadow::STYLE_INACTIVE);
+  EXPECT_EQ(delegate()->last_resource_id(), IDR_AURA_SHADOW_INACTIVE);
+}
+
+// Test if the proper content bounds is calculated based on the current style.
+TEST_F(ShadowTest, SetContentBounds) {
+  scoped_ptr<Shadow> shadow(new Shadow());
+
+  // Verify that layer bounds are inset from content bounds.
+  shadow->Init(Shadow::STYLE_ACTIVE);
+  gfx::Rect content_bounds(100, 100, 300, 300);
+  shadow->SetContentBounds(content_bounds);
+  EXPECT_EQ(shadow->content_bounds(), content_bounds);
+  EXPECT_EQ(shadow->layer()->bounds(), gfx::Rect(36, 36, 428, 428));
+
+  shadow->SetStyle(Shadow::STYLE_SMALL);
+  EXPECT_EQ(shadow->content_bounds(), content_bounds);
+  EXPECT_EQ(shadow->layer()->bounds(), gfx::Rect(96, 96, 308, 308));
+}
+}  // namespace wm