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

Unified Diff: ui/gfx/path_win_unittest.cc

Issue 673623002: Fix regions generation on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CreateHRGNFromSkPath can return empty region now. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/path_win_unittest.cc
diff --git a/ui/gfx/path_win_unittest.cc b/ui/gfx/path_win_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d03c3bc45b47a1a7876090f2ef17d5dd1297ca15
--- /dev/null
+++ b/ui/gfx/path_win_unittest.cc
@@ -0,0 +1,101 @@
+// 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 "base/win/scoped_gdi_object.h"
+#include "skia/ext/skia_utils_win.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkRRect.h"
+#include "ui/gfx/path.h"
+#include "ui/gfx/path_win.h"
+
+namespace {
+
+std::vector<SkIRect> GetRectsFromHRGN(HRGN region) {
+
Wez 2014/10/27 20:28:39 nit: no need for this blank line
alex-ac 2014/10/28 10:38:35 Done.
+ // Determine the size of output buffer required to receive the region.
+ DWORD bytes_size = GetRegionData(region, 0, NULL);
+ CHECK_NE(0, bytes_size);
+
+ // Fetch the Windows RECTs that comprise the region.
+ std::vector<char> buffer(bytes_size);
+ LPRGNDATA region_data = reinterpret_cast<LPRGNDATA>(buffer.data());
+ DWORD result = GetRegionData(region, bytes_size, region_data);
+ CHECK_EQ(bytes_size, result);
+
+ // Pull out the rectangles into a SkIRect vector to return to caller.
+ const LPRECT rects = reinterpret_cast<LPRECT>(&region_data->Buffer[0]);
+ std::vector<SkIRect> sk_rects(region_data->rdh.nCount);
+ std::transform(rects, rects + region_data->rdh.nCount,
+ sk_rects.begin(), skia::RECTToSkIRect);
Wez 2014/10/27 20:28:39 nit: suggest blank line here
alex-ac 2014/10/28 10:38:35 Done.
+ return sk_rects;
+}
+
+} // namespace
+
+// Test that rectangle with round corners stil has round corners after
+// converting from SkPath to the HRGN.
+TEST(CreateHRGNFromSkPathTest, RoundCornerTest) {
+ const SkIRect rects[] = {
+ { 17, 0, 33, 1},
+ { 12, 1, 38, 2},
+ { 11, 2, 39, 3},
+ { 9, 3, 41, 4},
+ { 8, 4, 42, 5},
+ { 6, 5, 44, 6},
+ { 5, 6, 45, 8},
+ { 4, 8, 46, 9},
+ { 3, 9, 47, 11},
+ { 2, 11, 48, 12},
+ { 1, 12, 49, 17},
+ { 0, 17, 50, 33},
+ { 1, 33, 49, 38},
+ { 2, 38, 48, 39},
+ { 3, 39, 47, 41},
+ { 4, 41, 46, 42},
+ { 5, 42, 45, 44},
+ { 6, 44, 44, 45},
+ { 8, 45, 42, 46},
+ { 9, 46, 41, 47},
+ { 11, 47, 39, 48},
+ { 12, 48, 38, 49},
+ { 17, 49, 33, 50},
+ };
+
+ gfx::Path path;
+ SkRRect rrect;
+ rrect.setRectXY(SkRect::MakeWH(50, 50), 20, 20);
+ path.addRRect(rrect);
+ base::win::ScopedRegion region(gfx::CreateHRGNFromSkPath(path));
+ const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region);
+ 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]);
+}
+
+// Check that non contiguous path is translated to region correctly.
Wez 2014/10/27 20:28:39 Suggest: Check that a path enclosing two non-adjac
alex-ac 2014/10/28 10:38:35 Done.
+TEST(CreateHRGNFromSkPathTest, NonContiguousPath) {
+ const SkIRect rects[] = {
+ { 0, 0, 50, 50},
+ { 100, 100, 150, 150},
+ };
+
+ gfx::Path path;
+ for (const SkIRect& rect : rects) {
+ path.addRect(SkRect::Make(rect));
+ }
+ base::win::ScopedRegion region(gfx::CreateHRGNFromSkPath(path));
+ const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region);
+ 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]);
+}
+
+// Check that empty region is returned for empty path.
+TEST(CreateHRGNFromSkPathTest, EmptyPath) {
+ gfx::Path path;
+ base::win::ScopedRegion empty_region(::CreateRectRgn(0, 0, 0, 0));
+ base::win::ScopedRegion region(gfx::CreateHRGNFromSkPath(path));
+ EXPECT_TRUE(::EqualRgn(empty_region, region));
+}
+

Powered by Google App Engine
This is Rietveld 408576698