Makes GetClipBounds() return the enclosing rect

ui/gfx/canvas.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/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/font_list.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/canvas_skia_paint.h"
 #endif
 
 namespace gfx {
@@ skipping 177 matching lines @@
 void Canvas::ClipPath(const SkPath& path, bool do_anti_alias) {
   canvas_->clipPath(path, SkRegion::kIntersect_Op, do_anti_alias);
 }
 
 bool Canvas::IsClipEmpty() const {
   return canvas_->isClipEmpty();
 }
 
 bool Canvas::GetClipBounds(Rect* bounds) {
   SkRect out;
-  bool has_non_empty_clip = canvas_->getClipBounds(&out);
-  bounds->SetRect(out.left(), out.top(), out.width(), out.height());
-  return has_non_empty_clip;
+  if (canvas_->getClipBounds(&out)) {
+    *bounds = ToEnclosingRect(SkRectToRectF(out));
+    return true;
+  }
+  *bounds = gfx::Rect();
+  return false;
 }
 
 void Canvas::Translate(const Vector2d& offset) {
   canvas_->translate(SkIntToScalar(offset.x()), SkIntToScalar(offset.y()));
 }
 
 void Canvas::Scale(int x_scale, int y_scale) {
   canvas_->scale(SkIntToScalar(x_scale), SkIntToScalar(y_scale));
 }
 
@@ skipping 406 matching lines @@
   SkPaint p(paint);
   p.setFilterLevel(filter ? SkPaint::kLow_FilterLevel
                           : SkPaint::kNone_FilterLevel);
   p.setShader(shader.get());
 
   // The rect will be filled by the bitmap.
   canvas_->drawRect(dest_rect, p);
 }
 
 }  // namespace gfx