diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 23:43:19 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 23:43:19 +0000 |
| commit | b6a368fea40855d56268979936a453ff98009203 (patch) | |
| tree | 00a3fcf3a5520aee95880352a42480efcb33c861 /ui/gfx | |
| parent | 360faf72e827459c4881841ba361c9761847d370 (diff) | |
| download | chromium_src-b6a368fea40855d56268979936a453ff98009203.zip chromium_src-b6a368fea40855d56268979936a453ff98009203.tar.gz chromium_src-b6a368fea40855d56268979936a453ff98009203.tar.bz2 | |
Use IntersectsClipRectInt() more, in hopes of saving some work. Original idea from http://codereview.chromium.org/3134041/ .
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6897011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
| -rw-r--r-- | ui/gfx/canvas_skia.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/canvas_skia_linux.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc index e61f0f2..5177116 100644 --- a/ui/gfx/canvas_skia.cc +++ b/ui/gfx/canvas_skia.cc @@ -232,8 +232,8 @@ void CanvasSkia::DrawBitmapInt(const SkBitmap& bitmap, const SkPaint& paint) { DLOG_ASSERT(src_x + src_w < std::numeric_limits<int16_t>::max() && src_y + src_h < std::numeric_limits<int16_t>::max()); - if (src_w <= 0 || src_h <= 0 || dest_w <= 0 || dest_h <= 0) { - NOTREACHED() << "Attempting to draw bitmap to/from an empty rect!"; + if (src_w <= 0 || src_h <= 0) { + NOTREACHED() << "Attempting to draw bitmap from an empty rect!"; return; } diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc index e28727f..796bfb8 100644 --- a/ui/gfx/canvas_skia_linux.cc +++ b/ui/gfx/canvas_skia_linux.cc @@ -351,7 +351,7 @@ void CanvasSkia::DrawStringWithHalo(const string16& text, const SkColor& halo_color, int x, int y, int w, int h, int flags) { - if (w <= 0 || h <= 0) + if (!IntersectsClipRectInt(x, y, w, h)) return; gfx::Rect bounds(x, y, w, h); @@ -365,7 +365,7 @@ void CanvasSkia::DrawStringInt(const string16& text, const SkColor& color, int x, int y, int w, int h, int flags) { - if (w <= 0 || h <= 0) + if (!IntersectsClipRectInt(x, y, w, h)) return; gfx::Rect bounds(x, y, w, h); |