Changeset 51319 in webkit

Timestamp:

Nov 23, 2009 2:10:55 PM (14 years ago)

Author:

agl@chromium.org

Message:

2009-11-23 Adam Langley <​agl@google.com>

Reviewed by Dmitry Titov.

Chromium Linux: Limit the stroke width and mitre limit.

Limit the stroke width and mitre limit that we'll pass into Skia to
avoid overflowing Skia's uint16_t glyph widths.

​http://code.google.com/p/chromium/issues/detail?id=28250
​https://bugs.webkit.org/show_bug.cgi?id=31747

• platform/graphics/skia/PlatformContextSkia.cpp: (scalarBound): (PlatformContextSkia::setupPaintForStroking):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/PlatformContextSkia.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-23  Adam Langley  <agl@google.com>
+
+        Reviewed by Dmitry Titov.
+
+        Chromium Linux: Limit the stroke width and mitre limit.
+
+        Limit the stroke width and mitre limit that we'll pass into Skia to
+        avoid overflowing Skia's uint16_t glyph widths.
+
+        http://code.google.com/p/chromium/issues/detail?id=28250
+        https://bugs.webkit.org/show_bug.cgi?id=31747
+
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (scalarBound):
+        (PlatformContextSkia::setupPaintForStroking):
+
 2009-11-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

@@ -344 +344 @@
 }
 
+static SkScalar scalarBound(SkScalar v, SkScalar min, SkScalar max)
+{
+    if (v < min)
+        return min;
+    if (v > max)
+        return max;
+    return v;
+}
+
 float PlatformContextSkia::setupPaintForStroking(SkPaint* paint, SkRect* rect, int length) const
 {
@@ -352 +361 @@
     paint->setShader(m_state->m_strokeShader);
     paint->setStyle(SkPaint::kStroke_Style);
-    paint->setStrokeWidth(SkFloatToScalar(width));
+    // The limits here (512 and 256) were made up but are hopefully large
+    // enough to be reasonable. They are, empirically, small enough not to
+    // cause overflows in Skia.
+    paint->setStrokeWidth(scalarBound(SkFloatToScalar(width), 0, 512));
     paint->setStrokeCap(m_state->m_lineCap);
     paint->setStrokeJoin(m_state->m_lineJoin);
-    paint->setStrokeMiter(SkFloatToScalar(m_state->m_miterLimit));
+    paint->setStrokeMiter(scalarBound(SkFloatToScalar(m_state->m_miterLimit), 0, 256));
 
     if (m_state->m_dash)