Changeset 47607 in webkit

Timestamp:

Aug 20, 2009 4:30:30 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-20 Stephen White <​senorblanco@chromium.org>

Reviewed by Eric Seidel.

Fix for assert in Chromium page cycler: drawRect() was re-using
an SkPaint, but not resetting it before calling
PlatformGraphicsSkia::setupPaintForFilling() a second time. This
CL fixes drawRect(), and re-enables the assert.
​http://bugs.webkit.org/show_bug.cgi?id=28172
​http://crbug.com/19797

Covered by Chromium page cycler tests.

• platform/graphics/skia/PlatformContextSkia.cpp: (PlatformContextSkia::drawRect): (PlatformContextSkia::setupPaintCommon):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-20  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix for assert in Chromium page cycler:  drawRect() was re-using
+        an SkPaint, but not resetting it before calling
+        PlatformGraphicsSkia::setupPaintForFilling() a second time.  This
+        CL fixes drawRect(), and re-enables the assert.
+        http://bugs.webkit.org/show_bug.cgi?id=28172
+        http://crbug.com/19797
+
+        Covered by Chromium page cycler tests.
+
+        * platform/graphics/skia/PlatformContextSkia.cpp:
+        (PlatformContextSkia::drawRect):
+        (PlatformContextSkia::setupPaintCommon):
+
 2009-08-20  Anders Carlsson  <andersca@apple.com>
 

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

@@ -279 +279 @@
         oldFillShader->safeRef();
         setFillColor(m_state->m_strokeColor);
+        paint.reset();
         setupPaintForFilling(&paint);
         SkRect topBorder = { rect.fLeft, rect.fTop, rect.fRight, rect.fTop + 1 };
@@ -296 +297 @@
 void PlatformContextSkia::setupPaintCommon(SkPaint* paint) const
 {
-    // http://trac.webkit.org/changeset/47386/ re-enabled this assert and it
-    // immediately started being hit in page cycler code.
-    // FIXME: Re-enable it.
-#if defined(SK_DEBUG) && 0
+#if defined(SK_DEBUG)
     {
         SkPaint defaultPaint;