Makes GetClipBounds() return the enclosing rect

ui/gfx/canvas_unittest.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 <limits>
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font_list.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/skia_util.h"
 
 namespace gfx {
 
 class CanvasTest : public testing::Test {
  protected:
   int GetStringWidth(const char *text) {
     return Canvas::GetStringWidth(base::UTF8ToUTF16(text), font_list_);
   }
 
   gfx::Size SizeStringInt(const char *text, int width, int line_height) {
@@ skipping 17 matching lines @@
 TEST_F(CanvasTest, StringWidthEmptyString) {
   EXPECT_EQ(0, GetStringWidth(""));
 }
 
 TEST_F(CanvasTest, StringSizeEmptyString) {
   gfx::Size size = SizeStringInt("", 0, 0);
   EXPECT_EQ(0, size.width());
   EXPECT_GT(size.height(), 0);
 }
 
+// Verifies GetClipBounds() returns the correct value.
+TEST_F(CanvasTest, ClipRectWithScaling) {
+  Canvas canvas(gfx::Size(200, 100), 2.25, true);
+  canvas.sk_canvas()->clipRect(RectFToSkRect(gfx::RectF(100, 0, 20, 1.7f)));

[danakj, 2014/09/10 18:27:16]

nit: 1.2 to show it's not just rounding?

[sky, 2014/09/10 18:29:51]

Actually, the 1.2 isn't the interesting part here. It's the 100,20, because of
scaling.

[danakj, 2014/09/10 18:32:13]

Ooh didn't see the scaling, ok cool :)

+  gfx::Rect clip_rect;
+  ASSERT_TRUE(canvas.GetClipBounds(&clip_rect));
+  // Use Contains() rather than Equals() as skia may extend the rect in certain
+  // directions. None-the-less the clip must contain the region we damaged.
+  EXPECT_TRUE(clip_rect.Contains(gfx::Rect(100, 0, 20, 2)));
+}
+
 // Line height is only supported on Skia.
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
 #define MAYBE_StringSizeWithLineHeight DISABLED_StringSizeWithLineHeight
 #else
 #define MAYBE_StringSizeWithLineHeight StringSizeWithLineHeight
 #endif
 
 TEST_F(CanvasTest, MAYBE_StringSizeWithLineHeight) {
   gfx::Size one_line_size = SizeStringInt("Q", 0, 0);
   gfx::Size four_line_size = SizeStringInt("Q\nQ\nQ\nQ", 1000000, 1000);
   EXPECT_EQ(one_line_size.width(), four_line_size.width());
   EXPECT_EQ(3 * 1000 + one_line_size.height(), four_line_size.height());
 }
 
 }  // namespace gfx