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

Unified Diff: ui/gfx/path_win_unittest.cc

Issue 169223002: Revert of Fix CreateHRGNFromSkPath to support arbitrary SkPaths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « ui/gfx/path_win.cc ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/path_win_unittest.cc
diff --git a/ui/gfx/path_win_unittest.cc b/ui/gfx/path_win_unittest.cc
deleted file mode 100644
index 0bd87a426a919b857d1c0bc76ee73d99623b9ef1..0000000000000000000000000000000000000000
--- a/ui/gfx/path_win_unittest.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 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/logging.h"
-#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/SkPath.h"
-#include "third_party/skia/include/core/SkRegion.h"
-
-namespace gfx {
-namespace {
-
-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(bytes_size != 0);
-
- // 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(result == bytes_size);
-
- // Pull out the rectangles into a SkIRect vector to pass to setRects().
- 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);
-
- return sk_rects;
-}
-
-TEST(PathWinTest, BasicSkPathToHRGN) {
- SkPath path;
- path.moveTo(0.0f, 0.0f);
- path.rLineTo(100.0f, 0.0f);
- path.rLineTo(0.0f, 100.0f);
- path.rLineTo(-100.0f, 0.0f);
- path.rLineTo(0.0f, -100.0f);
- base::win::ScopedRegion region(CreateHRGNFromSkPath(path));
- std::vector<SkIRect> result = GetRectsFromHRGN(region);
- EXPECT_EQ(1U, result.size());
- EXPECT_EQ(0, result[0].left());
- EXPECT_EQ(0, result[0].top());
- EXPECT_EQ(100, result[0].right());
- EXPECT_EQ(100, result[0].bottom());
-}
-
-TEST(PathWinTest, NonContiguousSkPathToHRGN) {
- SkPath path;
- path.moveTo(0.0f, 0.0f);
- path.rLineTo(100.0f, 0.0f);
- path.rLineTo(0.0f, 100.0f);
- path.rLineTo(-100.0f, 0.0f);
- path.rLineTo(0.0f, -100.0f);
- path.moveTo(150.0f, 0.0f);
- path.rLineTo(100.0f, 0.0f);
- path.rLineTo(0.0f, 100.0f);
- path.rLineTo(-100.0f, 0.0f);
- path.rLineTo(0.0f, -100.0f);
- base::win::ScopedRegion region(CreateHRGNFromSkPath(path));
- std::vector<SkIRect> result = GetRectsFromHRGN(region);
- EXPECT_EQ(2U, result.size());
- EXPECT_EQ(0, result[0].left());
- EXPECT_EQ(0, result[0].top());
- EXPECT_EQ(100, result[0].right());
- EXPECT_EQ(100, result[0].bottom());
- EXPECT_EQ(150, result[1].left());
- EXPECT_EQ(0, result[1].top());
- EXPECT_EQ(250, result[1].right());
- EXPECT_EQ(100, result[1].bottom());
-}
-
-} // namespace
-} // namespace gfx
« no previous file with comments | « ui/gfx/path_win.cc ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698