diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/base/cursor/mojom | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/base/cursor/mojom')
| -rw-r--r-- | chromium/ui/base/cursor/mojom/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/ui/base/cursor/mojom/cursor_mojom_traits_unittest.cc | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/chromium/ui/base/cursor/mojom/BUILD.gn b/chromium/ui/base/cursor/mojom/BUILD.gn index 042d2160861..588e828c29d 100644 --- a/chromium/ui/base/cursor/mojom/BUILD.gn +++ b/chromium/ui/base/cursor/mojom/BUILD.gn @@ -33,7 +33,7 @@ source_set("mojom_traits") { ] public_deps = [ ":mojom_shared", - "//ui/base/cursor", + "//ui/base/cursor:cursor_base", ] deps = [ "//skia", @@ -56,7 +56,7 @@ source_set("unittests") { ":mojom_traits", "//testing/gtest", "//ui/base", - "//ui/base/cursor", + "//ui/base/cursor:cursor_base", "//ui/gfx:geometry_skia", "//ui/gfx/geometry/mojom:mojom_traits", ] diff --git a/chromium/ui/base/cursor/mojom/cursor_mojom_traits_unittest.cc b/chromium/ui/base/cursor/mojom/cursor_mojom_traits_unittest.cc index d3b1aee2f12..88f888b2709 100644 --- a/chromium/ui/base/cursor/mojom/cursor_mojom_traits_unittest.cc +++ b/chromium/ui/base/cursor/mojom/cursor_mojom_traits_unittest.cc @@ -7,7 +7,6 @@ #include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/cursor/cursor_lookup.h" #include "ui/base/cursor/mojom/cursor.mojom.h" #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" @@ -59,18 +58,18 @@ TEST_F(CursorStructTraitsTest, TestBitmapCursor) { EXPECT_EQ(ui::mojom::CursorType::kCustom, output.type()); EXPECT_EQ(kScale, output.image_scale_factor()); - EXPECT_EQ(kHotspot, GetCursorHotspot(output)); + EXPECT_EQ(kHotspot, output.custom_hotspot()); // Even though the pixel data is the same, the bitmap generation ids differ. EXPECT_TRUE( - gfx::BitmapsAreEqual(GetCursorBitmap(input), GetCursorBitmap(output))); - EXPECT_NE(GetCursorBitmap(input).getGenerationID(), - GetCursorBitmap(output).getGenerationID()); + gfx::BitmapsAreEqual(input.custom_bitmap(), output.custom_bitmap())); + EXPECT_NE(input.custom_bitmap().getGenerationID(), + output.custom_bitmap().getGenerationID()); // Make a copy of output; the bitmap generation ids should be the same. ui::Cursor copy = output; - EXPECT_EQ(GetCursorBitmap(output).getGenerationID(), - GetCursorBitmap(copy).getGenerationID()); + EXPECT_EQ(output.custom_bitmap().getGenerationID(), + copy.custom_bitmap().getGenerationID()); EXPECT_EQ(input, output); } @@ -88,7 +87,7 @@ TEST_F(CursorStructTraitsTest, TestEmptyCursor) { ui::Cursor output; ASSERT_TRUE(EchoCursor(input, &output)); - EXPECT_TRUE(GetCursorBitmap(output).empty()); + EXPECT_TRUE(output.custom_bitmap().empty()); } // Test that various device scale factors are passed correctly over the wire. |