Chromium -> Mojo roll.

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 <set>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 195 matching lines @@
       painting_control = ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED;
       break;
     default:
       NOTREACHED();
   }
 
   canvas->save();
   canvas->translate(SkFloatToScalar(-layer_rect_.x()),
                     SkFloatToScalar(-layer_rect_.y()));
 
-  SkRect layer_skrect = SkRect::MakeXYWH(layer_rect_.x(),
-                                         layer_rect_.y(),
-                                         layer_rect_.width(),
-                                         layer_rect_.height());
-  canvas->clipRect(layer_skrect);
+  canvas->clipRect(gfx::RectToSkRect(layer_rect_));
 
   painter->PaintContents(canvas.get(), layer_rect_, painting_control);
 
   canvas->restore();
   picture_ = skia::AdoptRef(recorder.endRecording());
   DCHECK(picture_);
 
   EmitTraceSnapshot();
 }
 
@@ skipping 102 matching lines @@
 scoped_refptr<base::trace_event::ConvertableToTraceFormat>
     Picture::AsTraceableRecordData() const {
   scoped_refptr<base::trace_event::TracedValue> record_data =
       new base::trace_event::TracedValue();
   TracedValue::SetIDRef(this, record_data.get(), "picture_id");
   MathUtil::AddToTracedValue("layer_rect", layer_rect_, record_data.get());
   return record_data;
 }
 
 }  // namespace cc