summaryrefslogtreecommitdiffstats
path: root/ui/views/bubble
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 05:43:31 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 05:43:31 +0000
commitf2705ac0994dd4eb07ce08c1d70b94a20eae016c (patch)
treefde36dc250d3590ad1e9f8347339ca811742c485 /ui/views/bubble
parent398e5d1ce15fb26fc8172ba9963b86d9fd6765d5 (diff)
downloadchromium_src-f2705ac0994dd4eb07ce08c1d70b94a20eae016c.zip
chromium_src-f2705ac0994dd4eb07ce08c1d70b94a20eae016c.tar.gz
chromium_src-f2705ac0994dd4eb07ce08c1d70b94a20eae016c.tar.bz2
Speculative Revert 120885 - ui/gfx: Make the first version of Canvas::TileImageInt take a gfx::Rect.
BUG=100898 R=pkasting@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9332006 TBR=tfarina@chromium.org Review URL: https://chromiumcodereview.appspot.com/9358015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/bubble')
-rw-r--r--ui/views/bubble/bubble_border.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
index c2e4756..51f4ce2 100644
--- a/ui/views/bubble/bubble_border.cc
+++ b/ui/views/bubble/bubble_border.cc
@@ -319,8 +319,8 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
after_arrow,
images_->left->width() - images_->left_arrow->width());
} else {
- canvas->TileImage(*images_->left, gfx::Rect(left, top + tl_height, l_width,
- height - tl_height - bl_height));
+ canvas->TileImageInt(*images_->left, left, top + tl_height, l_width,
+ height - tl_height - bl_height);
}
// Top left corner.
@@ -348,8 +348,8 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
after_arrow,
images_->top->height() - images_->top_arrow->height());
} else {
- canvas->TileImage(*images_->top, gfx::Rect(left + tl_width, top,
- width - tl_width - tr_width, t_height));
+ canvas->TileImageInt(*images_->top, left + tl_width, top,
+ width - tl_width - tr_width, t_height);
}
// Top right corner.
@@ -379,8 +379,8 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
after_arrow,
0);
} else {
- canvas->TileImage(*images_->right, gfx::Rect(right - r_width,
- top + tr_height, r_width, height - tr_height - br_height));
+ canvas->TileImageInt(*images_->right, right - r_width, top + tr_height,
+ r_width, height - tr_height - br_height);
}
// Bottom right corner.
@@ -412,8 +412,8 @@ void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
after_arrow,
0);
} else {
- canvas->TileImage(*images_->bottom, gfx::Rect(left + bl_width,
- bottom - b_height, width - bl_width - br_width, b_height));
+ canvas->TileImageInt(*images_->bottom, left + bl_width, bottom - b_height,
+ width - bl_width - br_width, b_height);
}
// Bottom left corner.
@@ -441,9 +441,9 @@ void BubbleBorder::DrawEdgeWithArrow(gfx::Canvas* canvas,
* before_arrow ─┘ └─ after_arrow
*/
if (before_arrow) {
- canvas->TileImage(*edge, gfx::Rect(start_x, start_y,
+ canvas->TileImageInt(*edge, start_x, start_y,
is_horizontal ? before_arrow : edge->width(),
- is_horizontal ? edge->height() : before_arrow));
+ is_horizontal ? edge->height() : before_arrow);
}
canvas->DrawBitmapInt(*arrow,
@@ -453,9 +453,9 @@ void BubbleBorder::DrawEdgeWithArrow(gfx::Canvas* canvas,
if (after_arrow) {
start_x += (is_horizontal ? before_arrow + arrow->width() : 0);
start_y += (is_horizontal ? 0 : before_arrow + arrow->height());
- canvas->TileImage(*edge, gfx::Rect(start_x, start_y,
+ canvas->TileImageInt(*edge, start_x, start_y,
is_horizontal ? after_arrow : edge->width(),
- is_horizontal ? edge->height() : after_arrow));
+ is_horizontal ? edge->height() : after_arrow);
}
}