Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

skia/ext/analysis_canvas.cc

 // Copyright (c) 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 "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/src/core/SkRasterClip.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 
 namespace {
 
 const int kNoLayer = -1;
 
 bool ActsLikeClear(SkXfermode::Mode mode, unsigned src_alpha) {
   switch (mode) {
     case SkXfermode::kClear_Mode:
       return true;
     case SkXfermode::kSrc_Mode:
@@ skipping 422 matching lines @@
       force_not_transparent_stack_level_ = kNoLayer;
     }
   }
 
   INHERITED::willRestore();
 }
 
 }  // namespace skia