WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 254 matching lines @@
 {
     SkPaint paint;
     int fillcolorNotTransparent = m_state->m_fillColor & 0xFF000000;
     if (fillcolorNotTransparent) {
         setupPaintForFilling(&paint);
         canvas()->drawRect(rect, paint);
     }
 
     if (m_state->m_strokeStyle != WebCore::NoStroke &&
         (m_state->m_strokeColor & 0xFF000000)) {
-        if (fillcolorNotTransparent) {
-            // This call is expensive so don't call it unnecessarily.
-            paint.reset();
-        }
-        setupPaintForStroking(&paint, &rect, 0);
-        canvas()->drawRect(rect, paint);
+        // We do a fill of four rects to simulate the stroke of a border.
+        SkColor oldFillColor = m_state->m_fillColor;
+        if (oldFillColor != m_state->m_strokeColor)
+            setFillColor(m_state->m_strokeColor);
+        setupPaintForFilling(&paint);
+        SkRect topBorder = { rect.fLeft, rect.fTop, rect.width(), 1};
+        canvas()->drawRect(topBorder, paint);
+        SkRect bottomBorder = { rect.fLeft, rect.fBottom - 1, rect.width(), 1 };
+        canvas()->drawRect(bottomBorder, paint);
+        SkRect leftBorder = { rect.fLeft, rect.fTop + 1, 1, rect.height() - 2 };
+        canvas()->drawRect(leftBorder, paint);
+        SkRect rightBorder = { rect.fRight - 1, rect.fTop + 1, 1, rect.height() - 2 };
+        canvas()->drawRect(rightBorder, paint);
+        if (oldFillColor != m_state->m_strokeColor)
+            setFillColor(oldFillColor);
     }
 }
 
 void PlatformContextSkia::setupPaintCommon(SkPaint* paint) const
 {
 #ifdef SK_DEBUGx
     {
         SkPaint defaultPaint;
         SkASSERT(*paint == defaultPaint);
     }
@@ skipping 13 matching lines @@
 {
     setupPaintCommon(paint);
     paint->setColor(m_state->applyAlpha(m_state->m_fillColor));
 }
 
 float PlatformContextSkia::setupPaintForStroking(SkPaint* paint, SkRect* rect, int length) const
 {
     setupPaintCommon(paint);
     float width = m_state->m_strokeThickness;
 
-    // This allows dashing and dotting to work properly for hairline strokes.
-    if (width == 0)
-        width = 1;
-
     paint->setColor(m_state->applyAlpha(m_state->m_strokeColor));
     paint->setStyle(SkPaint::kStroke_Style);
     paint->setStrokeWidth(SkFloatToScalar(width));
     paint->setStrokeCap(m_state->m_lineCap);
     paint->setStrokeJoin(m_state->m_lineJoin);
     paint->setStrokeMiter(SkFloatToScalar(m_state->m_miterLimit));
 
-    if (rect != 0 && (static_cast<int>(roundf(width)) & 1))
-        rect->inset(-SK_ScalarHalf, -SK_ScalarHalf);
-
     if (m_state->m_dash)
         paint->setPathEffect(m_state->m_dash);
     else {
         switch (m_state->m_strokeStyle) {
         case WebCore::NoStroke:
         case WebCore::SolidStroke:
             break;
         case WebCore::DashedStroke:
             width = m_state->m_dashRatio * width;
             // Fall through.
         case WebCore::DottedStroke:
             SkScalar dashLength;
             if (length) {
                 // Determine about how many dashes or dots we should have.
-                int numDashes = length / roundf(width);
+                float roundedWidth = roundf(width);
+                int numDashes = roundedWidth ? (length / roundedWidth) : length;
                 if (!(numDashes & 1))
                     numDashes++;    // Make it odd so we end on a dash/dot.
                 // Use the number of dashes to determine the length of a
                 // dash/dot, which will be approximately width
                 dashLength = SkScalarDiv(SkIntToScalar(length), SkIntToScalar(numDashes));
             } else
                 dashLength = SkFloatToScalar(width);
             SkScalar intervals[2] = { dashLength, dashLength };
             paint->setPathEffect(new SkDashPathEffect(intervals, 2, 0))->unref();
         }
@@ skipping 163 matching lines @@
 #if defined(__linux__) || PLATFORM(WIN_OS)
 void PlatformContextSkia::applyClipFromImage(const WebCore::FloatRect& rect, const SkBitmap& imageBuffer)
 {
     // NOTE: this assumes the image mask contains opaque black for the portions that are to be shown, as such we
     // only look at the alpha when compositing. I'm not 100% sure this is what WebKit expects for image clipping.
     SkPaint paint;
     paint.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode);
     m_canvas->drawBitmap(imageBuffer, SkFloatToScalar(rect.x()), SkFloatToScalar(rect.y()), &paint);
 }
 #endif