Index: Source/platform/fonts/Font.cpp |
diff --git a/Source/platform/fonts/Font.cpp b/Source/platform/fonts/Font.cpp |
index 2aca587e3924ba04b548f1afc031d91c538b9dfa..ce2503fec478398de6990aca9f6332df5ebdae8c 100644 |
--- a/Source/platform/fonts/Font.cpp |
+++ b/Source/platform/fonts/Font.cpp |
@@ -178,7 +178,7 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo |
return result; |
} |
-float Font::width(const TextRun& run, int& charsConsumed, Glyph& glyphId) const |
+float Font::width(const TextRun& run, unsigned& charsConsumed, Glyph& glyphId) const |
{ |
#if ENABLE(SVG_FONTS) |
if (TextRun::RenderingContext* renderingContext = run.renderingContext()) |
@@ -279,6 +279,8 @@ PassTextBlobPtr Font::buildTextBlob(const GlyphBuffer& glyphBuffer, float initia |
FloatRect Font::selectionRectForText(const TextRun& run, const FloatPoint& point, int h, int from, int to, bool accountForGlyphBounds) const |
{ |
to = (to == -1 ? run.length() : to); |
+ ASSERT(from >= 0); |
jochen (gone - plz use gerrit)
2014/10/20 11:44:25
this is hit in FindInPageControllerTest.FindInPage
|
+ ASSERT(to >= 0); |
TextRunPaintInfo runInfo(run); |
runInfo.from = from; |