Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

skia/ext/skia_utils_win.cc

Index: skia/ext/skia_utils_win.cc
diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc
deleted file mode 100644
index e065b1e403cf30521d37bd0942890d28d9f8f050..0000000000000000000000000000000000000000
--- a/skia/ext/skia_utils_win.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2006-2008 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 "skia/ext/skia_utils_win.h"
-
-#include <stddef.h>
-#include <windows.h>
-
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/core/SkTypes.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
-
-namespace {
-
-SK_COMPILE_ASSERT(offsetof(RECT, left) == offsetof(SkIRect, fLeft), o1);
-SK_COMPILE_ASSERT(offsetof(RECT, top) == offsetof(SkIRect, fTop), o2);
-SK_COMPILE_ASSERT(offsetof(RECT, right) == offsetof(SkIRect, fRight), o3);
-SK_COMPILE_ASSERT(offsetof(RECT, bottom) == offsetof(SkIRect, fBottom), o4);
-SK_COMPILE_ASSERT(sizeof(RECT().left) == sizeof(SkIRect().fLeft), o5);
-SK_COMPILE_ASSERT(sizeof(RECT().top) == sizeof(SkIRect().fTop), o6);
-SK_COMPILE_ASSERT(sizeof(RECT().right) == sizeof(SkIRect().fRight), o7);
-SK_COMPILE_ASSERT(sizeof(RECT().bottom) == sizeof(SkIRect().fBottom), o8);
-SK_COMPILE_ASSERT(sizeof(RECT) == sizeof(SkIRect), o9);
-
-}  // namespace
-
-namespace skia {
-
-POINT SkPointToPOINT(const SkPoint& point) {
-  POINT win_point = {
-      SkScalarRoundToInt(point.fX), SkScalarRoundToInt(point.fY)
-  };
-  return win_point;
-}
-
-SkRect RECTToSkRect(const RECT& rect) {
-  SkRect sk_rect = { SkIntToScalar(rect.left), SkIntToScalar(rect.top),
-                     SkIntToScalar(rect.right), SkIntToScalar(rect.bottom) };
-  return sk_rect;
-}
-
-SkColor COLORREFToSkColor(COLORREF color) {
-#ifndef _MSC_VER
-  return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
-#else
-  // ARGB = 0xFF000000 | ((0BGR -> RGB0) >> 8)
-  return 0xFF000000u | (_byteswap_ulong(color) >> 8);
-#endif
-}
-
-COLORREF SkColorToCOLORREF(SkColor color) {
-#ifndef _MSC_VER
-  return RGB(SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
-#else
-  // 0BGR = ((ARGB -> BGRA) >> 8)
-  return (_byteswap_ulong(color) >> 8);
-#endif
-}
-
-}  // namespace skia
-