Revert of Splitting of layers for correct intersections

ui/gfx/skia_util.h

 // 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.
 
 #ifndef UI_GFX_SKIA_UTIL_H_
 #define UI_GFX_SKIA_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 class SkDrawLooper;
 
 namespace gfx {
 
 class ImageSkiaRep;
 class Rect;
 class RectF;
 class ShadowValue;
 class Transform;
 
 // Convert between Skia and gfx rect types.
 GFX_EXPORT SkRect RectToSkRect(const Rect& rect);
 GFX_EXPORT SkIRect RectToSkIRect(const Rect& rect);
 GFX_EXPORT Rect SkIRectToRect(const SkIRect& rect);
 GFX_EXPORT SkRect RectFToSkRect(const RectF& rect);
 GFX_EXPORT RectF SkRectToRectF(const SkRect& rect);
 GFX_EXPORT SkSize SizeFToSkSize(const SizeF& size);
 GFX_EXPORT SizeF SkSizeToSizeF(const SkSize& size);
 
-GFX_EXPORT void QuadFToSkPoints(const gfx::QuadF& quad, SkPoint points[4]);
-
 GFX_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
                                              SkMatrix* flattened);
 
 // Creates a bitmap shader for the image rep with the image rep's scale factor.
 // Sets the created shader's local matrix such that it displays the image rep at
 // the correct scale factor.
 // The shader's local matrix should not be changed after the shader is created.
 // TODO(pkotwicz): Allow shader's local matrix to be changed after the shader
 // is created.
 //
@@ skipping 27 matching lines @@
                                 const SkBitmap& bitmap2);
 
 // Converts Skia ARGB format pixels in |skia| to RGBA.
 GFX_EXPORT void ConvertSkiaToRGBA(const unsigned char* skia,
                                   int pixel_width,
                                   unsigned char* rgba);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_SKIA_UTIL_H_