commit 48821fc31c3987a68268139850ebc1b8d326ade5
author scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 24 14:10:57 2013 +0000
committer scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 24 14:10:57 2013 +0000
tree 271a4812cb65acc9921346e00a93121c32280083
parent f1a358f42c8f9a36e55db9eb838017de9aa5dcfc

Fix a bug in SkTextBox.

When checking to see if the line of text is beyond the bottom of
the textbox, compare with the bottom, rather than the height (bottom
- top). Prior to this change, text in the bottom of a textbox could
be clipped out.

BUG=https://code.google.com/p/skia/issues/detail?id=1250

Review URL: https://codereview.chromium.org/13856017

git-svn-id: http://skia.googlecode.com/svn/trunk@8838 2bbb7eff-a529-9590-31e7-b0007b416f81

src/views/SkTextBox.cpp

diff --git a/src/views/SkTextBox.cpp b/src/views/SkTextBox.cpp
index b5dab09..b0a42cd 100644
--- a/src/views/SkTextBox.cpp
+++ b/src/views/SkTextBox.cpp
@@ -232,7 +232,7 @@
         if (text >= textStop)
             break;
         y += scaledSpacing;
-        if (y + metrics.fAscent >= height)
+        if (y + metrics.fAscent >= fBox.fBottom)
             break;
     }
 }