diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/ui/gfx/path_win_unittest.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ui/gfx/path_win_unittest.cc')
| -rw-r--r-- | chromium/ui/gfx/path_win_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/ui/gfx/path_win_unittest.cc b/chromium/ui/gfx/path_win_unittest.cc index 1c211d7dace..ca9e13a2bca 100644 --- a/chromium/ui/gfx/path_win_unittest.cc +++ b/chromium/ui/gfx/path_win_unittest.cc @@ -4,9 +4,12 @@ #include "ui/gfx/path_win.h" +#include <stddef.h> + #include <algorithm> #include <vector> +#include "base/macros.h" #include "base/win/scoped_gdi_object.h" #include "skia/ext/skia_utils_win.h" #include "testing/gtest/include/gtest/gtest.h" @@ -79,7 +82,7 @@ TEST(CreateHRGNFromSkPathTest, RoundCornerTest) { rrect.setRectXY(SkRect::MakeWH(50, 50), 20, 20); path.addRRect(rrect); base::win::ScopedRegion region(CreateHRGNFromSkPath(path)); - const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region); + const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region.get()); EXPECT_EQ(arraysize(rects), region_rects.size()); for (size_t i = 0; i < arraysize(rects) && i < region_rects.size(); ++i) EXPECT_EQ(rects[i], region_rects[i]); @@ -98,7 +101,7 @@ TEST(CreateHRGNFromSkPathTest, NonContiguousPath) { path.addRect(SkRect::Make(rect)); } base::win::ScopedRegion region(CreateHRGNFromSkPath(path)); - const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region); + const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region.get()); ASSERT_EQ(arraysize(rects), region_rects.size()); for (size_t i = 0; i < arraysize(rects); ++i) EXPECT_EQ(rects[i], region_rects[i]); @@ -109,7 +112,7 @@ TEST(CreateHRGNFromSkPathTest, EmptyPath) { Path path; base::win::ScopedRegion empty_region(::CreateRectRgn(0, 0, 0, 0)); base::win::ScopedRegion region(CreateHRGNFromSkPath(path)); - EXPECT_TRUE(::EqualRgn(empty_region, region)); + EXPECT_TRUE(::EqualRgn(empty_region.get(), region.get())); } } // namespace gfx |