Fix regions generation on windows.
On windows HRGN for window is generated from the SkPath using dumb
function that doesn`t respects anything except simple polygons. It's
impossible to create window with round corners on windows. Replacing
implementation of that function with a new one will fix this.
[email protected]
BUG=322360
Review URL: https://codereview.chromium.org/673623002
Cr-Commit-Position: refs/heads/master@{#304045}
diff --git a/ui/gfx/gfx_tests.gyp b/ui/gfx/gfx_tests.gyp
index c61701e..1f6a2008 100644
--- a/ui/gfx/gfx_tests.gyp
+++ b/ui/gfx/gfx_tests.gyp
@@ -147,6 +147,7 @@
'font_fallback_win_unittest.cc',
'icon_util_unittest.cc',
'icon_util_unittests.rc',
+ 'path_win_unittest.cc',
'platform_font_win_unittest.cc',
],
'msvs_settings': {
diff --git a/ui/gfx/path_win.cc b/ui/gfx/path_win.cc
index b28ea7a..0f55253 100644
--- a/ui/gfx/path_win.cc
+++ b/ui/gfx/path_win.cc
@@ -25,16 +25,11 @@
}
HRGN CreateHRGNFromSkPath(const SkPath& path) {
- int point_count = path.getPoints(NULL, 0);
- scoped_ptr<SkPoint[]> points(new SkPoint[point_count]);
- path.getPoints(points.get(), point_count);
- scoped_ptr<POINT[]> windows_points(new POINT[point_count]);
- for (int i = 0; i < point_count; ++i) {
- windows_points[i].x = SkScalarRoundToInt(points[i].fX);
- windows_points[i].y = SkScalarRoundToInt(points[i].fY);
- }
-
- return ::CreatePolygonRgn(windows_points.get(), point_count, ALTERNATE);
+ SkRegion clip_region;
+ clip_region.setRect(path.getBounds().round());
+ SkRegion region;
+ region.setPath(path, clip_region);
+ return CreateHRGNFromSkRegion(region);
}
// See path_aura.cc for Aura definition of these methods:
diff --git a/ui/gfx/path_win.h b/ui/gfx/path_win.h
index 317a6fb07..2b85075 100644
--- a/ui/gfx/path_win.h
+++ b/ui/gfx/path_win.h
@@ -19,7 +19,7 @@
GFX_EXPORT HRGN CreateHRGNFromSkRegion(const SkRegion& path);
// Creates a new HRGN given |path|. The caller is responsible for destroying
-// the returned region.
+// the returned region. Returns empty region (not NULL) for empty path.
GFX_EXPORT HRGN CreateHRGNFromSkPath(const SkPath& path);
} // namespace gfx
diff --git a/ui/gfx/path_win_unittest.cc b/ui/gfx/path_win_unittest.cc
new file mode 100644
index 0000000..9ca4cf1
--- /dev/null
+++ b/ui/gfx/path_win_unittest.cc
@@ -0,0 +1,111 @@
+// 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/gfx/path_win.h"
+
+#include <algorithm>
+#include <vector>
+
+#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"
+
+namespace gfx {
+
+namespace {
+
+// Get rectangles from the |region| and convert them to SkIRect.
+std::vector<SkIRect> GetRectsFromHRGN(HRGN region) {
+ // Determine the size of output buffer required to receive the region.
+ DWORD bytes_size = GetRegionData(region, 0, NULL);
+ CHECK_NE((DWORD)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>(®ion_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);
+
+ 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},
+ };
+
+ Path path;
+ SkRRect rrect;
+ 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);
+ 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 a path enclosing two non-adjacent areas is correctly translated
+// to a non-contiguous region.
+TEST(CreateHRGNFromSkPathTest, NonContiguousPath) {
+ const SkIRect rects[] = {
+ { 0, 0, 50, 50},
+ { 100, 100, 150, 150},
+ };
+
+ Path path;
+ for (const SkIRect& rect : rects) {
+ path.addRect(SkRect::Make(rect));
+ }
+ base::win::ScopedRegion region(CreateHRGNFromSkPath(path));
+ const std::vector<SkIRect>& region_rects = GetRectsFromHRGN(region);
+ ASSERT_EQ(arraysize(rects), region_rects.size());
+ for (size_t i = 0; i < arraysize(rects); ++i)
+ EXPECT_EQ(rects[i], region_rects[i]);
+}
+
+// Check that empty region is returned for empty path.
+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));
+}
+
+} // namespace gfx
+
