use SkClipOps where we can, legacyClip where we need to rework

cc/resources/picture.cc

 // Copyright 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 "cc/resources/picture.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 285 matching lines @@
       "cc",
       "Picture::Raster",
       "data",
       AsTraceableRasterData(contents_scale));
 
   DCHECK(picture_);
 
   canvas->save();
 
   for (Region::Iterator it(negated_content_region); it.has_rect(); it.next())
-    canvas->clipRect(gfx::RectToSkRect(it.rect()), SkRegion::kDifference_Op);
+    canvas->clipRect(gfx::RectToSkRect(it.rect()), kDifference_SkClipOp);
 
   canvas->scale(contents_scale, contents_scale);
   canvas->translate(layer_rect_.x(), layer_rect_.y());
   if (callback) {
     // If we have a callback, we need to call |draw()|, |drawPicture()| doesn't
     // take a callback.  This is used by |AnalysisCanvas| to early out.
     picture_->playback(canvas, callback);
   } else {
     // Prefer to call |drawPicture()| on the canvas since it could place the
     // entire picture on the canvas instead of parsing the skia operations.
@@ skipping 160 matching lines @@
   scoped_refptr<base::debug::TracedValue> record_data =
       new base::debug::TracedValue();
   TracedValue::SetIDRef(this, record_data.get(), "picture_id");
   record_data->BeginArray("layer_rect");
   MathUtil::AddToTracedValue(layer_rect_, record_data.get());
   record_data->EndArray();
   return record_data;
 }
 
 }  // namespace cc