Update from https://crrev.com/320343

ui/gfx/skia_util.cc

 // Copyright (c) 2012 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/skia_util.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkLayerDrawLooper.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/quad_f.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 
 SkRect RectToSkRect(const Rect& rect) {
   SkRect r;
   r.iset(rect.x(), rect.y(), rect.right(), rect.bottom());
   return r;
 }
 
@@ skipping 12 matching lines @@
                           SkFloatToScalar(rect.height()));
 }
 
 RectF SkRectToRectF(const SkRect& rect) {
   return RectF(SkScalarToFloat(rect.x()),
                SkScalarToFloat(rect.y()),
                SkScalarToFloat(rect.width()),
                SkScalarToFloat(rect.height()));
 }
 
+SkSize SizeFToSkSize(const SizeF& size) {
+  return SkSize::Make(SkFloatToScalar(size.width()),
+                      SkFloatToScalar(size.height()));
+}
+
+SizeF SkSizeToSizeF(const SkSize& size) {
+  return SizeF(SkScalarToFloat(size.width()), SkScalarToFloat(size.height()));
+}
+
 void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
                                   SkMatrix* flattened) {
   // Convert from 4x4 to 3x3 by dropping the third row and column.
   flattened->set(0, SkMScalarToScalar(transform.matrix().get(0, 0)));
   flattened->set(1, SkMScalarToScalar(transform.matrix().get(0, 1)));
   flattened->set(2, SkMScalarToScalar(transform.matrix().get(0, 3)));
   flattened->set(3, SkMScalarToScalar(transform.matrix().get(1, 0)));
   flattened->set(4, SkMScalarToScalar(transform.matrix().get(1, 1)));
   flattened->set(5, SkMScalarToScalar(transform.matrix().get(1, 3)));
   flattened->set(6, SkMScalarToScalar(transform.matrix().get(3, 0)));
@@ skipping 34 matching lines @@
 }
 
 void ConvertSkiaToRGBA(const unsigned char* skia,
                        int pixel_width,
                        unsigned char* rgba) {
   int total_length = pixel_width * 4;
   for (int i = 0; i < total_length; i += 4) {
     const uint32_t pixel_in = *reinterpret_cast<const uint32_t*>(&skia[i]);
 
     // Pack the components here.
-    int alpha = SkGetPackedA32(pixel_in);
+    SkAlpha alpha = SkGetPackedA32(pixel_in);
     if (alpha != 0 && alpha != 255) {
       SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(pixel_in);
       rgba[i + 0] = SkColorGetR(unmultiplied);
       rgba[i + 1] = SkColorGetG(unmultiplied);
       rgba[i + 2] = SkColorGetB(unmultiplied);
       rgba[i + 3] = alpha;
     } else {
       rgba[i + 0] = SkGetPackedR32(pixel_in);
       rgba[i + 1] = SkGetPackedG32(pixel_in);
       rgba[i + 2] = SkGetPackedB32(pixel_in);
       rgba[i + 3] = alpha;
     }
   }
 }
 
+void QuadFToSkPoints(const gfx::QuadF& quad, SkPoint points[4]) {
+  points[0] = SkPoint::Make(quad.p1().x(), quad.p1().y());
+  points[1] = SkPoint::Make(quad.p2().x(), quad.p2().y());
+  points[2] = SkPoint::Make(quad.p3().x(), quad.p3().y());
+  points[3] = SkPoint::Make(quad.p4().x(), quad.p4().y());
+}
+
 }  // namespace gfx